aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/pcmcia')
-rw-r--r--drivers/pcmcia/bcm63xx_pcmcia.c12
-rw-r--r--drivers/pcmcia/bfin_cf_pcmcia.c6
-rw-r--r--drivers/pcmcia/db1xxx_ss.c6
-rw-r--r--drivers/pcmcia/ds.c13
-rw-r--r--drivers/pcmcia/electra_cf.c4
-rw-r--r--drivers/pcmcia/i82092.c6
-rw-r--r--drivers/pcmcia/pd6729.c8
-rw-r--r--drivers/pcmcia/pxa2xx_sharpsl.c2
-rw-r--r--drivers/pcmcia/rsrc_nonstatic.c6
-rw-r--r--drivers/pcmcia/sa1100_assabet.c2
-rw-r--r--drivers/pcmcia/sa1100_cerf.c2
-rw-r--r--drivers/pcmcia/sa1100_generic.c4
-rw-r--r--drivers/pcmcia/sa1100_h3600.c2
-rw-r--r--drivers/pcmcia/sa1100_shannon.c2
-rw-r--r--drivers/pcmcia/sa1100_simpad.c2
-rw-r--r--drivers/pcmcia/sa1111_generic.c4
-rw-r--r--drivers/pcmcia/sa1111_jornada720.c2
-rw-r--r--drivers/pcmcia/vrc4171_card.c8
-rw-r--r--drivers/pcmcia/vrc4173_cardu.c8
-rw-r--r--drivers/pcmcia/xxs1500_ss.c6
-rw-r--r--drivers/pcmcia/yenta_socket.c6
21 files changed, 50 insertions, 61 deletions
diff --git a/drivers/pcmcia/bcm63xx_pcmcia.c b/drivers/pcmcia/bcm63xx_pcmcia.c
index c2e997a570bf..0c6aac1232fc 100644
--- a/drivers/pcmcia/bcm63xx_pcmcia.c
+++ b/drivers/pcmcia/bcm63xx_pcmcia.c
@@ -323,7 +323,7 @@ static struct pccard_operations bcm63xx_pcmcia_operations = {
323/* 323/*
324 * register pcmcia socket to core 324 * register pcmcia socket to core
325 */ 325 */
326static int __devinit bcm63xx_drv_pcmcia_probe(struct platform_device *pdev) 326static int bcm63xx_drv_pcmcia_probe(struct platform_device *pdev)
327{ 327{
328 struct bcm63xx_pcmcia_socket *skt; 328 struct bcm63xx_pcmcia_socket *skt;
329 struct pcmcia_socket *sock; 329 struct pcmcia_socket *sock;
@@ -436,7 +436,7 @@ err:
436 return ret; 436 return ret;
437} 437}
438 438
439static int __devexit bcm63xx_drv_pcmcia_remove(struct platform_device *pdev) 439static int bcm63xx_drv_pcmcia_remove(struct platform_device *pdev)
440{ 440{
441 struct bcm63xx_pcmcia_socket *skt; 441 struct bcm63xx_pcmcia_socket *skt;
442 struct resource *res; 442 struct resource *res;
@@ -453,7 +453,7 @@ static int __devexit bcm63xx_drv_pcmcia_remove(struct platform_device *pdev)
453 453
454struct platform_driver bcm63xx_pcmcia_driver = { 454struct platform_driver bcm63xx_pcmcia_driver = {
455 .probe = bcm63xx_drv_pcmcia_probe, 455 .probe = bcm63xx_drv_pcmcia_probe,
456 .remove = __devexit_p(bcm63xx_drv_pcmcia_remove), 456 .remove = bcm63xx_drv_pcmcia_remove,
457 .driver = { 457 .driver = {
458 .name = "bcm63xx_pcmcia", 458 .name = "bcm63xx_pcmcia",
459 .owner = THIS_MODULE, 459 .owner = THIS_MODULE,
@@ -461,7 +461,7 @@ struct platform_driver bcm63xx_pcmcia_driver = {
461}; 461};
462 462
463#ifdef CONFIG_CARDBUS 463#ifdef CONFIG_CARDBUS
464static int __devinit bcm63xx_cb_probe(struct pci_dev *dev, 464static int bcm63xx_cb_probe(struct pci_dev *dev,
465 const struct pci_device_id *id) 465 const struct pci_device_id *id)
466{ 466{
467 /* keep pci device */ 467 /* keep pci device */
@@ -469,7 +469,7 @@ static int __devinit bcm63xx_cb_probe(struct pci_dev *dev,
469 return platform_driver_register(&bcm63xx_pcmcia_driver); 469 return platform_driver_register(&bcm63xx_pcmcia_driver);
470} 470}
471 471
472static void __devexit bcm63xx_cb_exit(struct pci_dev *dev) 472static void bcm63xx_cb_exit(struct pci_dev *dev)
473{ 473{
474 platform_driver_unregister(&bcm63xx_pcmcia_driver); 474 platform_driver_unregister(&bcm63xx_pcmcia_driver);
475 bcm63xx_cb_dev = NULL; 475 bcm63xx_cb_dev = NULL;
@@ -503,7 +503,7 @@ static struct pci_driver bcm63xx_cardbus_driver = {
503 .name = "bcm63xx_cardbus", 503 .name = "bcm63xx_cardbus",
504 .id_table = bcm63xx_cb_table, 504 .id_table = bcm63xx_cb_table,
505 .probe = bcm63xx_cb_probe, 505 .probe = bcm63xx_cb_probe,
506 .remove = __devexit_p(bcm63xx_cb_exit), 506 .remove = bcm63xx_cb_exit,
507}; 507};
508#endif 508#endif
509 509
diff --git a/drivers/pcmcia/bfin_cf_pcmcia.c b/drivers/pcmcia/bfin_cf_pcmcia.c
index ac1a2232eab9..ed3b522601b3 100644
--- a/drivers/pcmcia/bfin_cf_pcmcia.c
+++ b/drivers/pcmcia/bfin_cf_pcmcia.c
@@ -195,7 +195,7 @@ static struct pccard_operations bfin_cf_ops = {
195 195
196/*--------------------------------------------------------------------------*/ 196/*--------------------------------------------------------------------------*/
197 197
198static int __devinit bfin_cf_probe(struct platform_device *pdev) 198static int bfin_cf_probe(struct platform_device *pdev)
199{ 199{
200 struct bfin_cf_socket *cf; 200 struct bfin_cf_socket *cf;
201 struct resource *io_mem, *attr_mem; 201 struct resource *io_mem, *attr_mem;
@@ -286,7 +286,7 @@ fail0:
286 return status; 286 return status;
287} 287}
288 288
289static int __devexit bfin_cf_remove(struct platform_device *pdev) 289static int bfin_cf_remove(struct platform_device *pdev)
290{ 290{
291 struct bfin_cf_socket *cf = platform_get_drvdata(pdev); 291 struct bfin_cf_socket *cf = platform_get_drvdata(pdev);
292 292
@@ -307,7 +307,7 @@ static struct platform_driver bfin_cf_driver = {
307 .owner = THIS_MODULE, 307 .owner = THIS_MODULE,
308 }, 308 },
309 .probe = bfin_cf_probe, 309 .probe = bfin_cf_probe,
310 .remove = __devexit_p(bfin_cf_remove), 310 .remove = bfin_cf_remove,
311}; 311};
312 312
313module_platform_driver(bfin_cf_driver); 313module_platform_driver(bfin_cf_driver);
diff --git a/drivers/pcmcia/db1xxx_ss.c b/drivers/pcmcia/db1xxx_ss.c
index a484b1fb3382..a31e69ea99f3 100644
--- a/drivers/pcmcia/db1xxx_ss.c
+++ b/drivers/pcmcia/db1xxx_ss.c
@@ -409,7 +409,7 @@ static struct pccard_operations db1x_pcmcia_operations = {
409 .set_mem_map = au1x00_pcmcia_set_mem_map, 409 .set_mem_map = au1x00_pcmcia_set_mem_map,
410}; 410};
411 411
412static int __devinit db1x_pcmcia_socket_probe(struct platform_device *pdev) 412static int db1x_pcmcia_socket_probe(struct platform_device *pdev)
413{ 413{
414 struct db1x_pcmcia_sock *sock; 414 struct db1x_pcmcia_sock *sock;
415 struct resource *r; 415 struct resource *r;
@@ -559,7 +559,7 @@ out0:
559 return ret; 559 return ret;
560} 560}
561 561
562static int __devexit db1x_pcmcia_socket_remove(struct platform_device *pdev) 562static int db1x_pcmcia_socket_remove(struct platform_device *pdev)
563{ 563{
564 struct db1x_pcmcia_sock *sock = platform_get_drvdata(pdev); 564 struct db1x_pcmcia_sock *sock = platform_get_drvdata(pdev);
565 565
@@ -577,7 +577,7 @@ static struct platform_driver db1x_pcmcia_socket_driver = {
577 .owner = THIS_MODULE, 577 .owner = THIS_MODULE,
578 }, 578 },
579 .probe = db1x_pcmcia_socket_probe, 579 .probe = db1x_pcmcia_socket_probe,
580 .remove = __devexit_p(db1x_pcmcia_socket_remove), 580 .remove = db1x_pcmcia_socket_remove,
581}; 581};
582 582
583module_platform_driver(db1x_pcmcia_socket_driver); 583module_platform_driver(db1x_pcmcia_socket_driver);
diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index 079629bff957..2deacbb2ffdc 100644
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -920,8 +920,6 @@ static int pcmcia_bus_match(struct device *dev, struct device_driver *drv)
920 return 0; 920 return 0;
921} 921}
922 922
923#ifdef CONFIG_HOTPLUG
924
925static int pcmcia_bus_uevent(struct device *dev, struct kobj_uevent_env *env) 923static int pcmcia_bus_uevent(struct device *dev, struct kobj_uevent_env *env)
926{ 924{
927 struct pcmcia_device *p_dev; 925 struct pcmcia_device *p_dev;
@@ -962,15 +960,6 @@ static int pcmcia_bus_uevent(struct device *dev, struct kobj_uevent_env *env)
962 return 0; 960 return 0;
963} 961}
964 962
965#else
966
967static int pcmcia_bus_uevent(struct device *dev, struct kobj_uevent_env *env)
968{
969 return -ENODEV;
970}
971
972#endif
973
974/************************ runtime PM support ***************************/ 963/************************ runtime PM support ***************************/
975 964
976static int pcmcia_dev_suspend(struct device *dev, pm_message_t state); 965static int pcmcia_dev_suspend(struct device *dev, pm_message_t state);
@@ -1329,7 +1318,7 @@ static struct pcmcia_callback pcmcia_bus_callback = {
1329 .resume = pcmcia_bus_resume, 1318 .resume = pcmcia_bus_resume,
1330}; 1319};
1331 1320
1332static int __devinit pcmcia_bus_add_socket(struct device *dev, 1321static int pcmcia_bus_add_socket(struct device *dev,
1333 struct class_interface *class_intf) 1322 struct class_interface *class_intf)
1334{ 1323{
1335 struct pcmcia_socket *socket = dev_get_drvdata(dev); 1324 struct pcmcia_socket *socket = dev_get_drvdata(dev);
diff --git a/drivers/pcmcia/electra_cf.c b/drivers/pcmcia/electra_cf.c
index 7647d232e9e2..a007321ad314 100644
--- a/drivers/pcmcia/electra_cf.c
+++ b/drivers/pcmcia/electra_cf.c
@@ -181,7 +181,7 @@ static struct pccard_operations electra_cf_ops = {
181 .set_mem_map = electra_cf_set_mem_map, 181 .set_mem_map = electra_cf_set_mem_map,
182}; 182};
183 183
184static int __devinit electra_cf_probe(struct platform_device *ofdev) 184static int electra_cf_probe(struct platform_device *ofdev)
185{ 185{
186 struct device *device = &ofdev->dev; 186 struct device *device = &ofdev->dev;
187 struct device_node *np = ofdev->dev.of_node; 187 struct device_node *np = ofdev->dev.of_node;
@@ -324,7 +324,7 @@ fail1:
324 324
325} 325}
326 326
327static int __devexit electra_cf_remove(struct platform_device *ofdev) 327static int electra_cf_remove(struct platform_device *ofdev)
328{ 328{
329 struct device *device = &ofdev->dev; 329 struct device *device = &ofdev->dev;
330 struct electra_cf_socket *cf; 330 struct electra_cf_socket *cf;
diff --git a/drivers/pcmcia/i82092.c b/drivers/pcmcia/i82092.c
index 4e8831bdb6ef..3578e1ca97a0 100644
--- a/drivers/pcmcia/i82092.c
+++ b/drivers/pcmcia/i82092.c
@@ -35,7 +35,7 @@ static struct pci_driver i82092aa_pci_driver = {
35 .name = "i82092aa", 35 .name = "i82092aa",
36 .id_table = i82092aa_pci_ids, 36 .id_table = i82092aa_pci_ids,
37 .probe = i82092aa_pci_probe, 37 .probe = i82092aa_pci_probe,
38 .remove = __devexit_p(i82092aa_pci_remove), 38 .remove = i82092aa_pci_remove,
39}; 39};
40 40
41 41
@@ -67,7 +67,7 @@ static struct socket_info sockets[MAX_SOCKETS];
67static int socket_count; /* shortcut */ 67static int socket_count; /* shortcut */
68 68
69 69
70static int __devinit i82092aa_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) 70static int i82092aa_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
71{ 71{
72 unsigned char configbyte; 72 unsigned char configbyte;
73 int i, ret; 73 int i, ret;
@@ -162,7 +162,7 @@ err_out_disable:
162 return ret; 162 return ret;
163} 163}
164 164
165static void __devexit i82092aa_pci_remove(struct pci_dev *dev) 165static void i82092aa_pci_remove(struct pci_dev *dev)
166{ 166{
167 struct pcmcia_socket *socket = pci_get_drvdata(dev); 167 struct pcmcia_socket *socket = pci_get_drvdata(dev);
168 168
diff --git a/drivers/pcmcia/pd6729.c b/drivers/pcmcia/pd6729.c
index 253e3867dec7..b29d97e170ae 100644
--- a/drivers/pcmcia/pd6729.c
+++ b/drivers/pcmcia/pd6729.c
@@ -589,7 +589,7 @@ static int pd6729_check_irq(int irq)
589 return 0; 589 return 0;
590} 590}
591 591
592static u_int __devinit pd6729_isa_scan(void) 592static u_int pd6729_isa_scan(void)
593{ 593{
594 u_int mask0, mask = 0; 594 u_int mask0, mask = 0;
595 int i; 595 int i;
@@ -620,7 +620,7 @@ static u_int __devinit pd6729_isa_scan(void)
620 return mask; 620 return mask;
621} 621}
622 622
623static int __devinit pd6729_pci_probe(struct pci_dev *dev, 623static int pd6729_pci_probe(struct pci_dev *dev,
624 const struct pci_device_id *id) 624 const struct pci_device_id *id)
625{ 625{
626 int i, j, ret; 626 int i, j, ret;
@@ -739,7 +739,7 @@ err_out_free_mem:
739 return ret; 739 return ret;
740} 740}
741 741
742static void __devexit pd6729_pci_remove(struct pci_dev *dev) 742static void pd6729_pci_remove(struct pci_dev *dev)
743{ 743{
744 int i; 744 int i;
745 struct pd6729_socket *socket = pci_get_drvdata(dev); 745 struct pd6729_socket *socket = pci_get_drvdata(dev);
@@ -772,7 +772,7 @@ static struct pci_driver pd6729_pci_driver = {
772 .name = "pd6729", 772 .name = "pd6729",
773 .id_table = pd6729_pci_ids, 773 .id_table = pd6729_pci_ids,
774 .probe = pd6729_pci_probe, 774 .probe = pd6729_pci_probe,
775 .remove = __devexit_p(pd6729_pci_remove), 775 .remove = pd6729_pci_remove,
776}; 776};
777 777
778static int pd6729_module_init(void) 778static int pd6729_module_init(void)
diff --git a/drivers/pcmcia/pxa2xx_sharpsl.c b/drivers/pcmcia/pxa2xx_sharpsl.c
index 7dd879ce514d..89ebd8c76636 100644
--- a/drivers/pcmcia/pxa2xx_sharpsl.c
+++ b/drivers/pcmcia/pxa2xx_sharpsl.c
@@ -208,7 +208,7 @@ static struct pcmcia_low_level sharpsl_pcmcia_ops = {
208#ifdef CONFIG_SA1100_COLLIE 208#ifdef CONFIG_SA1100_COLLIE
209#include "sa11xx_base.h" 209#include "sa11xx_base.h"
210 210
211int __devinit pcmcia_collie_init(struct device *dev) 211int pcmcia_collie_init(struct device *dev)
212{ 212{
213 int ret = -ENODEV; 213 int ret = -ENODEV;
214 214
diff --git a/drivers/pcmcia/rsrc_nonstatic.c b/drivers/pcmcia/rsrc_nonstatic.c
index 9da9656242af..430a9ac56091 100644
--- a/drivers/pcmcia/rsrc_nonstatic.c
+++ b/drivers/pcmcia/rsrc_nonstatic.c
@@ -1199,7 +1199,7 @@ static const struct attribute_group rsrc_attributes = {
1199 .attrs = pccard_rsrc_attributes, 1199 .attrs = pccard_rsrc_attributes,
1200}; 1200};
1201 1201
1202static int __devinit pccard_sysfs_add_rsrc(struct device *dev, 1202static int pccard_sysfs_add_rsrc(struct device *dev,
1203 struct class_interface *class_intf) 1203 struct class_interface *class_intf)
1204{ 1204{
1205 struct pcmcia_socket *s = dev_get_drvdata(dev); 1205 struct pcmcia_socket *s = dev_get_drvdata(dev);
@@ -1209,7 +1209,7 @@ static int __devinit pccard_sysfs_add_rsrc(struct device *dev,
1209 return sysfs_create_group(&dev->kobj, &rsrc_attributes); 1209 return sysfs_create_group(&dev->kobj, &rsrc_attributes);
1210} 1210}
1211 1211
1212static void __devexit pccard_sysfs_remove_rsrc(struct device *dev, 1212static void pccard_sysfs_remove_rsrc(struct device *dev,
1213 struct class_interface *class_intf) 1213 struct class_interface *class_intf)
1214{ 1214{
1215 struct pcmcia_socket *s = dev_get_drvdata(dev); 1215 struct pcmcia_socket *s = dev_get_drvdata(dev);
@@ -1222,7 +1222,7 @@ static void __devexit pccard_sysfs_remove_rsrc(struct device *dev,
1222static struct class_interface pccard_rsrc_interface __refdata = { 1222static struct class_interface pccard_rsrc_interface __refdata = {
1223 .class = &pcmcia_socket_class, 1223 .class = &pcmcia_socket_class,
1224 .add_dev = &pccard_sysfs_add_rsrc, 1224 .add_dev = &pccard_sysfs_add_rsrc,
1225 .remove_dev = __devexit_p(&pccard_sysfs_remove_rsrc), 1225 .remove_dev = &pccard_sysfs_remove_rsrc,
1226}; 1226};
1227 1227
1228static int __init nonstatic_sysfs_init(void) 1228static int __init nonstatic_sysfs_init(void)
diff --git a/drivers/pcmcia/sa1100_assabet.c b/drivers/pcmcia/sa1100_assabet.c
index ba8557eea618..44cfc4416e54 100644
--- a/drivers/pcmcia/sa1100_assabet.c
+++ b/drivers/pcmcia/sa1100_assabet.c
@@ -95,7 +95,7 @@ static struct pcmcia_low_level assabet_pcmcia_ops = {
95 .socket_suspend = assabet_pcmcia_socket_suspend, 95 .socket_suspend = assabet_pcmcia_socket_suspend,
96}; 96};
97 97
98int __devinit pcmcia_assabet_init(struct device *dev) 98int pcmcia_assabet_init(struct device *dev)
99{ 99{
100 int ret = -ENODEV; 100 int ret = -ENODEV;
101 101
diff --git a/drivers/pcmcia/sa1100_cerf.c b/drivers/pcmcia/sa1100_cerf.c
index c59c44921a3a..b3774e5d0396 100644
--- a/drivers/pcmcia/sa1100_cerf.c
+++ b/drivers/pcmcia/sa1100_cerf.c
@@ -81,7 +81,7 @@ static struct pcmcia_low_level cerf_pcmcia_ops = {
81 .configure_socket = cerf_pcmcia_configure_socket, 81 .configure_socket = cerf_pcmcia_configure_socket,
82}; 82};
83 83
84int __devinit pcmcia_cerf_init(struct device *dev) 84int pcmcia_cerf_init(struct device *dev)
85{ 85{
86 int ret = -ENODEV; 86 int ret = -ENODEV;
87 87
diff --git a/drivers/pcmcia/sa1100_generic.c b/drivers/pcmcia/sa1100_generic.c
index 2eea664bc079..ff8a027a4afb 100644
--- a/drivers/pcmcia/sa1100_generic.c
+++ b/drivers/pcmcia/sa1100_generic.c
@@ -43,7 +43,7 @@
43 43
44int __init pcmcia_collie_init(struct device *dev); 44int __init pcmcia_collie_init(struct device *dev);
45 45
46static int (*sa11x0_pcmcia_hw_init[])(struct device *dev) __devinitdata = { 46static int (*sa11x0_pcmcia_hw_init[])(struct device *dev) = {
47#ifdef CONFIG_SA1100_ASSABET 47#ifdef CONFIG_SA1100_ASSABET
48 pcmcia_assabet_init, 48 pcmcia_assabet_init,
49#endif 49#endif
@@ -67,7 +67,7 @@ static int (*sa11x0_pcmcia_hw_init[])(struct device *dev) __devinitdata = {
67#endif 67#endif
68}; 68};
69 69
70static int __devinit sa11x0_drv_pcmcia_probe(struct platform_device *dev) 70static int sa11x0_drv_pcmcia_probe(struct platform_device *dev)
71{ 71{
72 int i, ret = -ENODEV; 72 int i, ret = -ENODEV;
73 73
diff --git a/drivers/pcmcia/sa1100_h3600.c b/drivers/pcmcia/sa1100_h3600.c
index d9c7337b909c..431d8b07cbaf 100644
--- a/drivers/pcmcia/sa1100_h3600.c
+++ b/drivers/pcmcia/sa1100_h3600.c
@@ -153,7 +153,7 @@ struct pcmcia_low_level h3600_pcmcia_ops = {
153 .socket_suspend = h3600_pcmcia_socket_suspend, 153 .socket_suspend = h3600_pcmcia_socket_suspend,
154}; 154};
155 155
156int __devinit pcmcia_h3600_init(struct device *dev) 156int pcmcia_h3600_init(struct device *dev)
157{ 157{
158 int ret = -ENODEV; 158 int ret = -ENODEV;
159 159
diff --git a/drivers/pcmcia/sa1100_shannon.c b/drivers/pcmcia/sa1100_shannon.c
index 56ab73915602..b07a2dc3296e 100644
--- a/drivers/pcmcia/sa1100_shannon.c
+++ b/drivers/pcmcia/sa1100_shannon.c
@@ -92,7 +92,7 @@ static struct pcmcia_low_level shannon_pcmcia_ops = {
92 .configure_socket = shannon_pcmcia_configure_socket, 92 .configure_socket = shannon_pcmcia_configure_socket,
93}; 93};
94 94
95int __devinit pcmcia_shannon_init(struct device *dev) 95int pcmcia_shannon_init(struct device *dev)
96{ 96{
97 int ret = -ENODEV; 97 int ret = -ENODEV;
98 98
diff --git a/drivers/pcmcia/sa1100_simpad.c b/drivers/pcmcia/sa1100_simpad.c
index 8647b17c449e..73fd37968b6a 100644
--- a/drivers/pcmcia/sa1100_simpad.c
+++ b/drivers/pcmcia/sa1100_simpad.c
@@ -109,7 +109,7 @@ static struct pcmcia_low_level simpad_pcmcia_ops = {
109 .socket_suspend = simpad_pcmcia_socket_suspend, 109 .socket_suspend = simpad_pcmcia_socket_suspend,
110}; 110};
111 111
112int __devinit pcmcia_simpad_init(struct device *dev) 112int pcmcia_simpad_init(struct device *dev)
113{ 113{
114 int ret = -ENODEV; 114 int ret = -ENODEV;
115 115
diff --git a/drivers/pcmcia/sa1111_generic.c b/drivers/pcmcia/sa1111_generic.c
index 70f728ce1856..65b02c3e14ce 100644
--- a/drivers/pcmcia/sa1111_generic.c
+++ b/drivers/pcmcia/sa1111_generic.c
@@ -211,7 +211,7 @@ static int pcmcia_probe(struct sa1111_dev *dev)
211 return 0; 211 return 0;
212} 212}
213 213
214static int __devexit pcmcia_remove(struct sa1111_dev *dev) 214static int pcmcia_remove(struct sa1111_dev *dev)
215{ 215{
216 struct sa1111_pcmcia_socket *next, *s = dev_get_drvdata(&dev->dev); 216 struct sa1111_pcmcia_socket *next, *s = dev_get_drvdata(&dev->dev);
217 217
@@ -234,7 +234,7 @@ static struct sa1111_driver pcmcia_driver = {
234 }, 234 },
235 .devid = SA1111_DEVID_PCMCIA, 235 .devid = SA1111_DEVID_PCMCIA,
236 .probe = pcmcia_probe, 236 .probe = pcmcia_probe,
237 .remove = __devexit_p(pcmcia_remove), 237 .remove = pcmcia_remove,
238}; 238};
239 239
240static int __init sa1111_drv_pcmcia_init(void) 240static int __init sa1111_drv_pcmcia_init(void)
diff --git a/drivers/pcmcia/sa1111_jornada720.c b/drivers/pcmcia/sa1111_jornada720.c
index 69428d1f5ae1..3baa3ef09682 100644
--- a/drivers/pcmcia/sa1111_jornada720.c
+++ b/drivers/pcmcia/sa1111_jornada720.c
@@ -91,7 +91,7 @@ static struct pcmcia_low_level jornada720_pcmcia_ops = {
91 .nr = 2, 91 .nr = 2,
92}; 92};
93 93
94int __devinit pcmcia_jornada720_init(struct device *dev) 94int pcmcia_jornada720_init(struct device *dev)
95{ 95{
96 int ret = -ENODEV; 96 int ret = -ENODEV;
97 97
diff --git a/drivers/pcmcia/vrc4171_card.c b/drivers/pcmcia/vrc4171_card.c
index 86e4a1a3c642..75806be344e5 100644
--- a/drivers/pcmcia/vrc4171_card.c
+++ b/drivers/pcmcia/vrc4171_card.c
@@ -564,7 +564,7 @@ static inline void reserve_using_irq(int slot)
564 vrc4171_irq_mask &= ~(1 << irq); 564 vrc4171_irq_mask &= ~(1 << irq);
565} 565}
566 566
567static int __devinit vrc4171_add_sockets(void) 567static int vrc4171_add_sockets(void)
568{ 568{
569 vrc4171_socket_t *socket; 569 vrc4171_socket_t *socket;
570 int slot, retval; 570 int slot, retval;
@@ -631,7 +631,7 @@ static void vrc4171_remove_sockets(void)
631 } 631 }
632} 632}
633 633
634static int __devinit vrc4171_card_setup(char *options) 634static int vrc4171_card_setup(char *options)
635{ 635{
636 if (options == NULL || *options == '\0') 636 if (options == NULL || *options == '\0')
637 return 1; 637 return 1;
@@ -712,7 +712,7 @@ static struct platform_driver vrc4171_card_driver = {
712 }, 712 },
713}; 713};
714 714
715static int __devinit vrc4171_card_init(void) 715static int vrc4171_card_init(void)
716{ 716{
717 int retval; 717 int retval;
718 718
@@ -746,7 +746,7 @@ static int __devinit vrc4171_card_init(void)
746 return 0; 746 return 0;
747} 747}
748 748
749static void __devexit vrc4171_card_exit(void) 749static void vrc4171_card_exit(void)
750{ 750{
751 free_irq(vrc4171_irq, vrc4171_sockets); 751 free_irq(vrc4171_irq, vrc4171_sockets);
752 vrc4171_remove_sockets(); 752 vrc4171_remove_sockets();
diff --git a/drivers/pcmcia/vrc4173_cardu.c b/drivers/pcmcia/vrc4173_cardu.c
index cd0a315d922b..d92692056e24 100644
--- a/drivers/pcmcia/vrc4173_cardu.c
+++ b/drivers/pcmcia/vrc4173_cardu.c
@@ -456,7 +456,7 @@ static void cardu_interrupt(int irq, void *dev_id)
456 } 456 }
457} 457}
458 458
459static int __devinit vrc4173_cardu_probe(struct pci_dev *dev, 459static int vrc4173_cardu_probe(struct pci_dev *dev,
460 const struct pci_device_id *ent) 460 const struct pci_device_id *ent)
461{ 461{
462 vrc4173_socket_t *socket; 462 vrc4173_socket_t *socket;
@@ -533,7 +533,7 @@ disable:
533 return ret; 533 return ret;
534} 534}
535 535
536static int __devinit vrc4173_cardu_setup(char *options) 536static int vrc4173_cardu_setup(char *options)
537{ 537{
538 if (options == NULL || *options == '\0') 538 if (options == NULL || *options == '\0')
539 return 1; 539 return 1;
@@ -574,14 +574,14 @@ static struct pci_driver vrc4173_cardu_driver = {
574 .id_table = vrc4173_cardu_id_table, 574 .id_table = vrc4173_cardu_id_table,
575}; 575};
576 576
577static int __devinit vrc4173_cardu_init(void) 577static int vrc4173_cardu_init(void)
578{ 578{
579 vrc4173_cardu_slots = 0; 579 vrc4173_cardu_slots = 0;
580 580
581 return pci_register_driver(&vrc4173_cardu_driver); 581 return pci_register_driver(&vrc4173_cardu_driver);
582} 582}
583 583
584static void __devexit vrc4173_cardu_exit(void) 584static void vrc4173_cardu_exit(void)
585{ 585{
586 pci_unregister_driver(&vrc4173_cardu_driver); 586 pci_unregister_driver(&vrc4173_cardu_driver);
587} 587}
diff --git a/drivers/pcmcia/xxs1500_ss.c b/drivers/pcmcia/xxs1500_ss.c
index fd5fbd10aad0..95f5b270ad44 100644
--- a/drivers/pcmcia/xxs1500_ss.c
+++ b/drivers/pcmcia/xxs1500_ss.c
@@ -204,7 +204,7 @@ static struct pccard_operations xxs1500_pcmcia_operations = {
204 .set_mem_map = au1x00_pcmcia_set_mem_map, 204 .set_mem_map = au1x00_pcmcia_set_mem_map,
205}; 205};
206 206
207static int __devinit xxs1500_pcmcia_probe(struct platform_device *pdev) 207static int xxs1500_pcmcia_probe(struct platform_device *pdev)
208{ 208{
209 struct xxs1500_pcmcia_sock *sock; 209 struct xxs1500_pcmcia_sock *sock;
210 struct resource *r; 210 struct resource *r;
@@ -299,7 +299,7 @@ out0:
299 return ret; 299 return ret;
300} 300}
301 301
302static int __devexit xxs1500_pcmcia_remove(struct platform_device *pdev) 302static int xxs1500_pcmcia_remove(struct platform_device *pdev)
303{ 303{
304 struct xxs1500_pcmcia_sock *sock = platform_get_drvdata(pdev); 304 struct xxs1500_pcmcia_sock *sock = platform_get_drvdata(pdev);
305 305
@@ -317,7 +317,7 @@ static struct platform_driver xxs1500_pcmcia_socket_driver = {
317 .owner = THIS_MODULE, 317 .owner = THIS_MODULE,
318 }, 318 },
319 .probe = xxs1500_pcmcia_probe, 319 .probe = xxs1500_pcmcia_probe,
320 .remove = __devexit_p(xxs1500_pcmcia_remove), 320 .remove = xxs1500_pcmcia_remove,
321}; 321};
322 322
323module_platform_driver(xxs1500_pcmcia_socket_driver); 323module_platform_driver(xxs1500_pcmcia_socket_driver);
diff --git a/drivers/pcmcia/yenta_socket.c b/drivers/pcmcia/yenta_socket.c
index 667678db1153..6b4ff099fb13 100644
--- a/drivers/pcmcia/yenta_socket.c
+++ b/drivers/pcmcia/yenta_socket.c
@@ -783,7 +783,7 @@ static void yenta_free_resources(struct yenta_socket *socket)
783/* 783/*
784 * Close it down - release our resources and go home.. 784 * Close it down - release our resources and go home..
785 */ 785 */
786static void __devexit yenta_close(struct pci_dev *dev) 786static void yenta_close(struct pci_dev *dev)
787{ 787{
788 struct yenta_socket *sock = pci_get_drvdata(dev); 788 struct yenta_socket *sock = pci_get_drvdata(dev);
789 789
@@ -1142,7 +1142,7 @@ static void yenta_fixup_parent_bridge(struct pci_bus *cardbus_bridge)
1142 * interrupt, and that we can map the cardbus area. Fill in the 1142 * interrupt, and that we can map the cardbus area. Fill in the
1143 * socket information structure.. 1143 * socket information structure..
1144 */ 1144 */
1145static int __devinit yenta_probe(struct pci_dev *dev, const struct pci_device_id *id) 1145static int yenta_probe(struct pci_dev *dev, const struct pci_device_id *id)
1146{ 1146{
1147 struct yenta_socket *socket; 1147 struct yenta_socket *socket;
1148 int ret; 1148 int ret;
@@ -1435,7 +1435,7 @@ static struct pci_driver yenta_cardbus_driver = {
1435 .name = "yenta_cardbus", 1435 .name = "yenta_cardbus",
1436 .id_table = yenta_table, 1436 .id_table = yenta_table,
1437 .probe = yenta_probe, 1437 .probe = yenta_probe,
1438 .remove = __devexit_p(yenta_close), 1438 .remove = yenta_close,
1439 .driver.pm = YENTA_PM_OPS, 1439 .driver.pm = YENTA_PM_OPS,
1440}; 1440};
1441 1441