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

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
...@@ -907,7 +907,7 @@ static int __init init_hs(void) ...@@ -907,7 +907,7 @@ static int __init init_hs(void)
for (i=0; i<HS_MAX_SOCKETS; i++) { for (i=0; i<HS_MAX_SOCKETS; i++) {
unsigned int ret; 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; hs_sockets[i].number = i;
ret = pcmcia_register_socket(&hs_sockets[i].socket); ret = pcmcia_register_socket(&hs_sockets[i].socket);
if (ret && i) if (ret && i)
......
...@@ -760,7 +760,7 @@ static int __init init_m32r_pcc(void) ...@@ -760,7 +760,7 @@ static int __init init_m32r_pcc(void)
/* Set up interrupt handler(s) */ /* Set up interrupt handler(s) */
for (i = 0 ; i < pcc_sockets ; i++) { 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.ops = &pcc_operations;
socket[i].socket.resource_ops = &pccard_nonstatic_ops; socket[i].socket.resource_ops = &pccard_nonstatic_ops;
socket[i].socket.owner = THIS_MODULE; socket[i].socket.owner = THIS_MODULE;
......
...@@ -1321,7 +1321,7 @@ static int __init m8xx_init(void) ...@@ -1321,7 +1321,7 @@ static int __init m8xx_init(void)
socket[i].socket.ops = &m8xx_services; socket[i].socket.ops = &m8xx_services;
socket[i].socket.resource_ops = &pccard_iodyn_ops; socket[i].socket.resource_ops = &pccard_iodyn_ops;
socket[i].socket.cb_dev = NULL; 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++) for (i = 0; i < PCMCIA_SOCKETS_NO; i++)
......
...@@ -291,7 +291,7 @@ static int __devinit omap_cf_probe(struct device *dev) ...@@ -291,7 +291,7 @@ static int __devinit omap_cf_probe(struct device *dev)
omap_cf_present() ? "present" : "(not present)"); omap_cf_present() ? "present" : "(not present)");
cf->socket.owner = THIS_MODULE; cf->socket.owner = THIS_MODULE;
cf->socket.dev.dev = dev; cf->socket.dev.parent = dev;
cf->socket.ops = &omap_cf_ops; cf->socket.ops = &omap_cf_ops;
cf->socket.resource_ops = &pccard_static_ops; cf->socket.resource_ops = &pccard_static_ops;
cf->socket.features = SS_CAP_PCCARD | SS_CAP_STATIC_MAP cf->socket.features = SS_CAP_PCCARD | SS_CAP_STATIC_MAP
......
...@@ -232,7 +232,7 @@ static struct resource *iodyn_find_io_region(unsigned long base, int num, ...@@ -232,7 +232,7 @@ static struct resource *iodyn_find_io_region(unsigned long base, int num,
unsigned long align, struct pcmcia_socket *s) unsigned long align, struct pcmcia_socket *s)
{ {
struct resource *res = make_resource(0, num, IORESOURCE_IO, struct resource *res = make_resource(0, num, IORESOURCE_IO,
s->dev.class_id); s->dev.bus_id);
struct pcmcia_align_data data; struct pcmcia_align_data data;
unsigned long min = base; unsigned long min = base;
int ret; int ret;
......
...@@ -596,7 +596,7 @@ static int __devinit vrc4171_add_sockets(void) ...@@ -596,7 +596,7 @@ static int __devinit vrc4171_add_sockets(void)
} }
sprintf(socket->name, "NEC VRC4171 Card Slot %1c", 'A' + slot); sprintf(socket->name, "NEC VRC4171 Card Slot %1c", 'A' + slot);
socket->pcmcia_socket.dev.dev = &vrc4171_card_device.dev; socket->pcmcia_socket.dev.parent = &vrc4171_card_device.dev;
socket->pcmcia_socket.ops = &vrc4171_pccard_operations; socket->pcmcia_socket.ops = &vrc4171_pccard_operations;
socket->pcmcia_socket.owner = THIS_MODULE; socket->pcmcia_socket.owner = THIS_MODULE;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment