aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2012-11-19 13:23:12 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-28 15:10:16 -0500
commit34cdf25a126f053698d549cc12a9c30e9a8a0bab (patch)
tree9efbc1df6dc293b7334c9dfac664505be0676cdc /drivers
parent96364e3a5cf1416c158a276134d9a4fc861548c2 (diff)
pcmcia: remove use of __devinit
CONFIG_HOTPLUG is going away as an option so __devinit is no longer needed. Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Cc: Eric Miao <eric.y.miao@gmail.com> Cc: Russell King <linux@arm.linux.org.uk> Cc: Haojian Zhuang <haojian.zhuang@gmail.com> Acked-by: Eric Miao <eric.y.miao@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/pcmcia/bcm63xx_pcmcia.c4
-rw-r--r--drivers/pcmcia/bfin_cf_pcmcia.c2
-rw-r--r--drivers/pcmcia/db1xxx_ss.c2
-rw-r--r--drivers/pcmcia/ds.c2
-rw-r--r--drivers/pcmcia/electra_cf.c2
-rw-r--r--drivers/pcmcia/i82092.c2
-rw-r--r--drivers/pcmcia/pd6729.c4
-rw-r--r--drivers/pcmcia/pxa2xx_sharpsl.c2
-rw-r--r--drivers/pcmcia/rsrc_nonstatic.c2
-rw-r--r--drivers/pcmcia/sa1100_assabet.c2
-rw-r--r--drivers/pcmcia/sa1100_cerf.c2
-rw-r--r--drivers/pcmcia/sa1100_generic.c2
-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_jornada720.c2
-rw-r--r--drivers/pcmcia/vrc4171_card.c6
-rw-r--r--drivers/pcmcia/vrc4173_cardu.c6
-rw-r--r--drivers/pcmcia/xxs1500_ss.c2
-rw-r--r--drivers/pcmcia/yenta_socket.c2
20 files changed, 26 insertions, 26 deletions
diff --git a/drivers/pcmcia/bcm63xx_pcmcia.c b/drivers/pcmcia/bcm63xx_pcmcia.c
index 57d1053d5bfa..7d2167995821 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;
@@ -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 */
diff --git a/drivers/pcmcia/bfin_cf_pcmcia.c b/drivers/pcmcia/bfin_cf_pcmcia.c
index 2f4bd2751c7a..dc1007392d56 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;
diff --git a/drivers/pcmcia/db1xxx_ss.c b/drivers/pcmcia/db1xxx_ss.c
index bbbf6f6c1dfc..aaded4fff4c0 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;
diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index 84e665961bbd..2deacbb2ffdc 100644
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -1318,7 +1318,7 @@ static struct pcmcia_callback pcmcia_bus_callback = {
1318 .resume = pcmcia_bus_resume, 1318 .resume = pcmcia_bus_resume,
1319}; 1319};
1320 1320
1321static int __devinit pcmcia_bus_add_socket(struct device *dev, 1321static int pcmcia_bus_add_socket(struct device *dev,
1322 struct class_interface *class_intf) 1322 struct class_interface *class_intf)
1323{ 1323{
1324 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..1fe3d88ee566 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;
diff --git a/drivers/pcmcia/i82092.c b/drivers/pcmcia/i82092.c
index 3f6110008e9b..26832de5f12c 100644
--- a/drivers/pcmcia/i82092.c
+++ b/drivers/pcmcia/i82092.c
@@ -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;
diff --git a/drivers/pcmcia/pd6729.c b/drivers/pcmcia/pd6729.c
index aa79c0cc6dcf..4bb8426afe6d 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;
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 fcf4152689b5..4c38a04d4356 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);
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..113bd4e978db 100644
--- a/drivers/pcmcia/sa1100_generic.c
+++ b/drivers/pcmcia/sa1100_generic.c
@@ -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_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..287d73be203c 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
diff --git a/drivers/pcmcia/vrc4173_cardu.c b/drivers/pcmcia/vrc4173_cardu.c
index cd0a315d922b..fa17e38c194d 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,7 +574,7 @@ 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
diff --git a/drivers/pcmcia/xxs1500_ss.c b/drivers/pcmcia/xxs1500_ss.c
index 86fa3dfc8bf9..86a89c732825 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;
diff --git a/drivers/pcmcia/yenta_socket.c b/drivers/pcmcia/yenta_socket.c
index 407f403800ea..caa92cc7a428 100644
--- a/drivers/pcmcia/yenta_socket.c
+++ b/drivers/pcmcia/yenta_socket.c
@@ -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;