aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2010-08-08 05:36:26 -0400
committerDominik Brodowski <linux@dominikbrodowski.net>2010-09-29 11:20:24 -0400
commit2e9b981a7c63ee8278df6823f8389d69dad1a499 (patch)
tree7d88e2a03a3202ba26ce7dbcf6909e28d44f690c /drivers/char
parent1cc745d1cdca8086b472a06671f0830fc0e98861 (diff)
pcmcia: move driver name to struct pcmcia_driver
Tested-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/pcmcia/cm4000_cs.c4
-rw-r--r--drivers/char/pcmcia/cm4040_cs.c4
-rw-r--r--drivers/char/pcmcia/ipwireless/main.c2
-rw-r--r--drivers/char/pcmcia/synclink_cs.c4
4 files changed, 4 insertions, 10 deletions
diff --git a/drivers/char/pcmcia/cm4000_cs.c b/drivers/char/pcmcia/cm4000_cs.c
index 79de9ccb8caf..e932526d4561 100644
--- a/drivers/char/pcmcia/cm4000_cs.c
+++ b/drivers/char/pcmcia/cm4000_cs.c
@@ -1877,9 +1877,7 @@ MODULE_DEVICE_TABLE(pcmcia, cm4000_ids);
1877 1877
1878static struct pcmcia_driver cm4000_driver = { 1878static struct pcmcia_driver cm4000_driver = {
1879 .owner = THIS_MODULE, 1879 .owner = THIS_MODULE,
1880 .drv = { 1880 .name = "cm4000_cs",
1881 .name = "cm4000_cs",
1882 },
1883 .probe = cm4000_probe, 1881 .probe = cm4000_probe,
1884 .remove = cm4000_detach, 1882 .remove = cm4000_detach,
1885 .suspend = cm4000_suspend, 1883 .suspend = cm4000_suspend,
diff --git a/drivers/char/pcmcia/cm4040_cs.c b/drivers/char/pcmcia/cm4040_cs.c
index bf012d228a9e..d7e2bec02485 100644
--- a/drivers/char/pcmcia/cm4040_cs.c
+++ b/drivers/char/pcmcia/cm4040_cs.c
@@ -643,9 +643,7 @@ MODULE_DEVICE_TABLE(pcmcia, cm4040_ids);
643 643
644static struct pcmcia_driver reader_driver = { 644static struct pcmcia_driver reader_driver = {
645 .owner = THIS_MODULE, 645 .owner = THIS_MODULE,
646 .drv = { 646 .name = "cm4040_cs",
647 .name = "cm4040_cs",
648 },
649 .probe = reader_probe, 647 .probe = reader_probe,
650 .remove = reader_detach, 648 .remove = reader_detach,
651 .id_table = cm4040_ids, 649 .id_table = cm4040_ids,
diff --git a/drivers/char/pcmcia/ipwireless/main.c b/drivers/char/pcmcia/ipwireless/main.c
index 594c23be69f5..a1b808346691 100644
--- a/drivers/char/pcmcia/ipwireless/main.c
+++ b/drivers/char/pcmcia/ipwireless/main.c
@@ -295,7 +295,7 @@ static struct pcmcia_driver me = {
295 .owner = THIS_MODULE, 295 .owner = THIS_MODULE,
296 .probe = ipwireless_attach, 296 .probe = ipwireless_attach,
297 .remove = ipwireless_detach, 297 .remove = ipwireless_detach,
298 .drv = { .name = IPWIRELESS_PCCARD_NAME }, 298 .name = IPWIRELESS_PCCARD_NAME,
299 .id_table = ipw_ids 299 .id_table = ipw_ids
300}; 300};
301 301
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
index 7c71913714ca..493dba51115b 100644
--- a/drivers/char/pcmcia/synclink_cs.c
+++ b/drivers/char/pcmcia/synclink_cs.c
@@ -2773,9 +2773,7 @@ MODULE_DEVICE_TABLE(pcmcia, mgslpc_ids);
2773 2773
2774static struct pcmcia_driver mgslpc_driver = { 2774static struct pcmcia_driver mgslpc_driver = {
2775 .owner = THIS_MODULE, 2775 .owner = THIS_MODULE,
2776 .drv = { 2776 .name = "synclink_cs",
2777 .name = "synclink_cs",
2778 },
2779 .probe = mgslpc_probe, 2777 .probe = mgslpc_probe,
2780 .remove = mgslpc_detach, 2778 .remove = mgslpc_detach,
2781 .id_table = mgslpc_ids, 2779 .id_table = mgslpc_ids,