aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/can
diff options
context:
space:
mode:
authorH Hartley Sweeten <hsweeten@visionengravers.com>2013-03-06 13:27:43 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-03-15 15:27:33 -0400
commitfdd3f29eddd1b7c26b3b42e3633afcb22a28fcb3 (patch)
treebac3ce9e595e7b2cb0fcc5ff0f5c7575e0185e00 /drivers/net/can
parentb85c4a18f6543873eaa71772f6252bc4d403eeb2 (diff)
drivers/net: use module_pcmcia_driver() in pcmcia drivers
Use the new module_pcmcia_driver() macro to remove the boilerplate module init/exit code in the pcmcia drivers. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/can')
-rw-r--r--drivers/net/can/sja1000/ems_pcmcia.c13
-rw-r--r--drivers/net/can/sja1000/peak_pcmcia.c13
2 files changed, 2 insertions, 24 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 319module_pcmcia_driver(ems_pcmcia_driver);
320static int __init ems_pcmcia_init(void)
321{
322 return pcmcia_register_driver(&ems_pcmcia_driver);
323}
324module_init(ems_pcmcia_init);
325
326static void __exit ems_pcmcia_exit(void)
327{
328 pcmcia_unregister_driver(&ems_pcmcia_driver);
329}
330module_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 743module_pcmcia_driver(pcan_driver);
744static int __init pcan_init(void)
745{
746 return pcmcia_register_driver(&pcan_driver);
747}
748module_init(pcan_init);
749
750static void __exit pcan_exit(void)
751{
752 pcmcia_unregister_driver(&pcan_driver);
753}
754module_exit(pcan_exit);