diff options
Diffstat (limited to 'drivers/pcmcia')
-rw-r--r-- | drivers/pcmcia/ds.c | 6 | ||||
-rw-r--r-- | drivers/pcmcia/rsrc_nonstatic.c | 6 | ||||
-rw-r--r-- | drivers/pcmcia/socket_sysfs.c | 6 |
3 files changed, 12 insertions, 6 deletions
diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c index 080608c7381a..39d096b52926 100644 --- a/drivers/pcmcia/ds.c +++ b/drivers/pcmcia/ds.c | |||
@@ -1157,7 +1157,8 @@ static struct pcmcia_callback pcmcia_bus_callback = { | |||
1157 | .requery = pcmcia_bus_rescan, | 1157 | .requery = pcmcia_bus_rescan, |
1158 | }; | 1158 | }; |
1159 | 1159 | ||
1160 | static int __devinit pcmcia_bus_add_socket(struct class_device *class_dev) | 1160 | static int __devinit pcmcia_bus_add_socket(struct class_device *class_dev, |
1161 | struct class_interface *class_intf) | ||
1161 | { | 1162 | { |
1162 | struct pcmcia_socket *socket = class_get_devdata(class_dev); | 1163 | struct pcmcia_socket *socket = class_get_devdata(class_dev); |
1163 | int ret; | 1164 | int ret; |
@@ -1192,7 +1193,8 @@ static int __devinit pcmcia_bus_add_socket(struct class_device *class_dev) | |||
1192 | return 0; | 1193 | return 0; |
1193 | } | 1194 | } |
1194 | 1195 | ||
1195 | static void pcmcia_bus_remove_socket(struct class_device *class_dev) | 1196 | static void pcmcia_bus_remove_socket(struct class_device *class_dev, |
1197 | struct class_interface *class_intf) | ||
1196 | { | 1198 | { |
1197 | struct pcmcia_socket *socket = class_get_devdata(class_dev); | 1199 | struct pcmcia_socket *socket = class_get_devdata(class_dev); |
1198 | 1200 | ||
diff --git a/drivers/pcmcia/rsrc_nonstatic.c b/drivers/pcmcia/rsrc_nonstatic.c index f9a5c70284b5..fc87e7e2b6b8 100644 --- a/drivers/pcmcia/rsrc_nonstatic.c +++ b/drivers/pcmcia/rsrc_nonstatic.c | |||
@@ -994,7 +994,8 @@ static struct class_device_attribute *pccard_rsrc_attributes[] = { | |||
994 | NULL, | 994 | NULL, |
995 | }; | 995 | }; |
996 | 996 | ||
997 | static int __devinit pccard_sysfs_add_rsrc(struct class_device *class_dev) | 997 | static int __devinit pccard_sysfs_add_rsrc(struct class_device *class_dev, |
998 | struct class_interface *class_intf) | ||
998 | { | 999 | { |
999 | struct pcmcia_socket *s = class_get_devdata(class_dev); | 1000 | struct pcmcia_socket *s = class_get_devdata(class_dev); |
1000 | struct class_device_attribute **attr; | 1001 | struct class_device_attribute **attr; |
@@ -1011,7 +1012,8 @@ static int __devinit pccard_sysfs_add_rsrc(struct class_device *class_dev) | |||
1011 | return ret; | 1012 | return ret; |
1012 | } | 1013 | } |
1013 | 1014 | ||
1014 | static void __devexit pccard_sysfs_remove_rsrc(struct class_device *class_dev) | 1015 | static void __devexit pccard_sysfs_remove_rsrc(struct class_device *class_dev, |
1016 | struct class_interface *class_intf) | ||
1015 | { | 1017 | { |
1016 | struct pcmcia_socket *s = class_get_devdata(class_dev); | 1018 | struct pcmcia_socket *s = class_get_devdata(class_dev); |
1017 | struct class_device_attribute **attr; | 1019 | struct class_device_attribute **attr; |
diff --git a/drivers/pcmcia/socket_sysfs.c b/drivers/pcmcia/socket_sysfs.c index 1040a6c1a8a4..4a3150a7854c 100644 --- a/drivers/pcmcia/socket_sysfs.c +++ b/drivers/pcmcia/socket_sysfs.c | |||
@@ -341,7 +341,8 @@ static struct bin_attribute pccard_cis_attr = { | |||
341 | .write = pccard_store_cis, | 341 | .write = pccard_store_cis, |
342 | }; | 342 | }; |
343 | 343 | ||
344 | static int __devinit pccard_sysfs_add_socket(struct class_device *class_dev) | 344 | static int __devinit pccard_sysfs_add_socket(struct class_device *class_dev, |
345 | struct class_interface *class_intf) | ||
345 | { | 346 | { |
346 | struct class_device_attribute **attr; | 347 | struct class_device_attribute **attr; |
347 | int ret = 0; | 348 | int ret = 0; |
@@ -357,7 +358,8 @@ static int __devinit pccard_sysfs_add_socket(struct class_device *class_dev) | |||
357 | return ret; | 358 | return ret; |
358 | } | 359 | } |
359 | 360 | ||
360 | static void __devexit pccard_sysfs_remove_socket(struct class_device *class_dev) | 361 | static void __devexit pccard_sysfs_remove_socket(struct class_device *class_dev, |
362 | struct class_interface *class_intf) | ||
361 | { | 363 | { |
362 | struct class_device_attribute **attr; | 364 | struct class_device_attribute **attr; |
363 | 365 | ||