Commit 4e47e467 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pcmcia-6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux 

Pull PCMCIA fixes and cleanups from Dominik Brodowski:
 "A number of minor PCMCIA bugfixes and cleanups, including the removal
  of unused code paths"

[ Dominik suggested this might be 6.18 material, but having looked
  through this, it looks appropriate early: minor trivial fixes and then
  one slightly bigger patch that removes dead code  - Linus ]

* tag 'pcmcia-6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux:
  pcmcia: Add error handling for add_interval() in do_validate_mem()
  pcmcia: cs: Remove unused pcmcia_get_socket_by_nr
  pcmcia: omap: Add missing check for platform_get_resource
  pcmcia: Use str_off_on() and str_yes_no() helpers
  pcmcia: remove PCCARD_IODYN
  pcmcia: ds: Emphasize "really" epizeuxis
  pcmcia: Fix a NULL pointer dereference in __iodyn_find_io_region()
  pcmcia: omap_cf: Mark driver struct with __refdata to prevent section mismatch
parents d69eb204 4a81f78c

drivers/pcmcia/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -250,7 +250,4 @@ config ELECTRA_CF 
config PCCARD_NONSTATIC

	bool



config PCCARD_IODYN

	bool



endif	# PCCARD

drivers/pcmcia/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ obj-$(CONFIG_PCMCIA) += pcmcia.o 


pcmcia_rsrc-y					+= rsrc_mgr.o

pcmcia_rsrc-$(CONFIG_PCCARD_NONSTATIC)		+= rsrc_nonstatic.o

pcmcia_rsrc-$(CONFIG_PCCARD_IODYN)		+= rsrc_iodyn.o

obj-$(CONFIG_PCCARD)				+= pcmcia_rsrc.o

drivers/pcmcia/cs.c

+0 −17
Original line number Diff line number Diff line
@@ -229,23 +229,6 @@ void pcmcia_unregister_socket(struct pcmcia_socket *socket) 
EXPORT_SYMBOL(pcmcia_unregister_socket);





struct pcmcia_socket *pcmcia_get_socket_by_nr(unsigned int nr)

{

	struct pcmcia_socket *s;



	down_read(&pcmcia_socket_list_rwsem);

	list_for_each_entry(s, &pcmcia_socket_list, socket_list)

		if (s->sock == nr) {

			up_read(&pcmcia_socket_list_rwsem);

			return s;

		}

	up_read(&pcmcia_socket_list_rwsem);



	return NULL;



}

EXPORT_SYMBOL(pcmcia_get_socket_by_nr);



static int socket_reset(struct pcmcia_socket *skt)

{

	int status, i;

drivers/pcmcia/cs_internal.h

+0 −1
Original line number Diff line number Diff line
@@ -116,7 +116,6 @@ extern struct list_head pcmcia_socket_list; 
extern const struct class pcmcia_socket_class;



int pccard_register_pcmcia(struct pcmcia_socket *s, struct pcmcia_callback *c);

struct pcmcia_socket *pcmcia_get_socket_by_nr(unsigned int nr);



void pcmcia_parse_uevents(struct pcmcia_socket *socket, unsigned int events);

#define PCMCIA_UEVENT_EJECT	0x0001

drivers/pcmcia/ds.c

+1 −1
Original line number Diff line number Diff line
@@ -1308,7 +1308,7 @@ static int pcmcia_bus_early_resume(struct pcmcia_socket *skt) 
 * physically present, even if the call to this function returns

 * non-NULL. Furthermore, the device driver most likely is unbound

 * almost immediately, so the timeframe where pcmcia_dev_present

 * returns NULL is probably really really small.

 * returns NULL is probably really, really small.

 */

struct pcmcia_device *pcmcia_dev_present(struct pcmcia_device *_p_dev)

{