Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dfe461ae authored by Manuel Lauss's avatar Manuel Lauss Committed by Greg Kroah-Hartman
Browse files

Driver core: more fallout from class_device changes for pcmcia 



More fallout from the PCMCIA class_device changes.

The first hunk is run-tested on SH-4, the others are converted
in the spirit of the original conversion.


Signed-off-by: default avatarManuel Lauss <mano@roarinelk.homelinux.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent d56c3eae

drivers/pcmcia/hd64465_ss.c

+1 −1
Original line number Diff line number Diff line
@@ -907,7 +907,7 @@ static int __init init_hs(void) 


	for (i=0; i<HS_MAX_SOCKETS; i++) {

		unsigned int ret;

		hs_sockets[i].socket.dev.dev = &hd64465_device.dev;		

		hs_sockets[i].socket.dev.parent = &hd64465_device.dev;

		hs_sockets[i].number = i;

		ret = pcmcia_register_socket(&hs_sockets[i].socket);

		if (ret && i)

drivers/pcmcia/m32r_cfc.c

+1 −1
Original line number Diff line number Diff line
@@ -760,7 +760,7 @@ static int __init init_m32r_pcc(void) 
	/* Set up interrupt handler(s) */



	for (i = 0 ; i < pcc_sockets ; i++) {

		socket[i].socket.dev.dev = &pcc_device.dev;

		socket[i].socket.dev.parent = &pcc_device.dev;

		socket[i].socket.ops = &pcc_operations;

		socket[i].socket.resource_ops = &pccard_nonstatic_ops;

		socket[i].socket.owner = THIS_MODULE;

drivers/pcmcia/m8xx_pcmcia.c

+1 −1
Original line number Diff line number Diff line
@@ -1321,7 +1321,7 @@ static int __init m8xx_init(void) 
		socket[i].socket.ops = &m8xx_services;

		socket[i].socket.resource_ops = &pccard_iodyn_ops;

		socket[i].socket.cb_dev = NULL;

		socket[i].socket.dev.dev = &m8xx_device.dev;

		socket[i].socket.dev.parent = &m8xx_device.dev;

	}



	for (i = 0; i < PCMCIA_SOCKETS_NO; i++)

drivers/pcmcia/omap_cf.c

+1 −1
Original line number Diff line number Diff line
@@ -291,7 +291,7 @@ static int __devinit omap_cf_probe(struct device *dev) 
		omap_cf_present() ? "present" : "(not present)");



	cf->socket.owner = THIS_MODULE;

	cf->socket.dev.dev = dev;

	cf->socket.dev.parent = dev;

	cf->socket.ops = &omap_cf_ops;

	cf->socket.resource_ops = &pccard_static_ops;

	cf->socket.features = SS_CAP_PCCARD | SS_CAP_STATIC_MAP

drivers/pcmcia/rsrc_mgr.c

+1 −1
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ static struct resource *iodyn_find_io_region(unsigned long base, int num, 
		unsigned long align, struct pcmcia_socket *s)

{

	struct resource *res = make_resource(0, num, IORESOURCE_IO,

					     s->dev.class_id);

					     s->dev.bus_id);

	struct pcmcia_align_data data;

	unsigned long min = base;

	int ret;