diff options
Diffstat (limited to 'drivers/net/can')
-rw-r--r-- | drivers/net/can/sja1000/ems_pcmcia.c | 13 | ||||
-rw-r--r-- | drivers/net/can/sja1000/peak_pcmcia.c | 13 | ||||
-rw-r--r-- | drivers/net/can/softing/softing_cs.c | 16 |
3 files changed, 4 insertions, 38 deletions
diff --git a/drivers/net/can/sja1000/ems_pcmcia.c b/drivers/net/can/sja1000/ems_pcmcia.c index 5c2f3fbbf5ae..321c27e1c7fc 100644 --- a/drivers/net/can/sja1000/ems_pcmcia.c +++ b/drivers/net/can/sja1000/ems_pcmcia.c | |||
@@ -316,15 +316,4 @@ static struct pcmcia_driver ems_pcmcia_driver = { | |||
316 | .remove = ems_pcmcia_remove, | 316 | .remove = ems_pcmcia_remove, |
317 | .id_table = ems_pcmcia_tbl, | 317 | .id_table = ems_pcmcia_tbl, |
318 | }; | 318 | }; |
319 | 319 | module_pcmcia_driver(ems_pcmcia_driver); | |
320 | static int __init ems_pcmcia_init(void) | ||
321 | { | ||
322 | return pcmcia_register_driver(&ems_pcmcia_driver); | ||
323 | } | ||
324 | module_init(ems_pcmcia_init); | ||
325 | |||
326 | static void __exit ems_pcmcia_exit(void) | ||
327 | { | ||
328 | pcmcia_unregister_driver(&ems_pcmcia_driver); | ||
329 | } | ||
330 | module_exit(ems_pcmcia_exit); | ||
diff --git a/drivers/net/can/sja1000/peak_pcmcia.c b/drivers/net/can/sja1000/peak_pcmcia.c index 1a7020ba37f5..0a707f70661c 100644 --- a/drivers/net/can/sja1000/peak_pcmcia.c +++ b/drivers/net/can/sja1000/peak_pcmcia.c | |||
@@ -740,15 +740,4 @@ static struct pcmcia_driver pcan_driver = { | |||
740 | .remove = pcan_remove, | 740 | .remove = pcan_remove, |
741 | .id_table = pcan_table, | 741 | .id_table = pcan_table, |
742 | }; | 742 | }; |
743 | 743 | module_pcmcia_driver(pcan_driver); | |
744 | static int __init pcan_init(void) | ||
745 | { | ||
746 | return pcmcia_register_driver(&pcan_driver); | ||
747 | } | ||
748 | module_init(pcan_init); | ||
749 | |||
750 | static void __exit pcan_exit(void) | ||
751 | { | ||
752 | pcmcia_unregister_driver(&pcan_driver); | ||
753 | } | ||
754 | module_exit(pcan_exit); | ||
diff --git a/drivers/net/can/softing/softing_cs.c b/drivers/net/can/softing/softing_cs.c index c2c0a5bb0b21..498605f833dd 100644 --- a/drivers/net/can/softing/softing_cs.c +++ b/drivers/net/can/softing/softing_cs.c | |||
@@ -27,7 +27,7 @@ | |||
27 | #include "softing_platform.h" | 27 | #include "softing_platform.h" |
28 | 28 | ||
29 | static int softingcs_index; | 29 | static int softingcs_index; |
30 | static spinlock_t softingcs_index_lock; | 30 | static DEFINE_SPINLOCK(softingcs_index_lock); |
31 | 31 | ||
32 | static int softingcs_reset(struct platform_device *pdev, int v); | 32 | static int softingcs_reset(struct platform_device *pdev, int v); |
33 | static int softingcs_enable_irq(struct platform_device *pdev, int v); | 33 | static int softingcs_enable_irq(struct platform_device *pdev, int v); |
@@ -340,19 +340,7 @@ static struct pcmcia_driver softingcs_driver = { | |||
340 | .remove = softingcs_remove, | 340 | .remove = softingcs_remove, |
341 | }; | 341 | }; |
342 | 342 | ||
343 | static int __init softingcs_start(void) | 343 | module_pcmcia_driver(softingcs_driver); |
344 | { | ||
345 | spin_lock_init(&softingcs_index_lock); | ||
346 | return pcmcia_register_driver(&softingcs_driver); | ||
347 | } | ||
348 | |||
349 | static void __exit softingcs_stop(void) | ||
350 | { | ||
351 | pcmcia_unregister_driver(&softingcs_driver); | ||
352 | } | ||
353 | |||
354 | module_init(softingcs_start); | ||
355 | module_exit(softingcs_stop); | ||
356 | 344 | ||
357 | MODULE_DESCRIPTION("softing CANcard driver" | 345 | MODULE_DESCRIPTION("softing CANcard driver" |
358 | ", links PCMCIA card to softing driver"); | 346 | ", links PCMCIA card to softing driver"); |