diff options
author | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-08-08 05:36:26 -0400 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-09-29 11:20:24 -0400 |
commit | 2e9b981a7c63ee8278df6823f8389d69dad1a499 (patch) | |
tree | 7d88e2a03a3202ba26ce7dbcf6909e28d44f690c /drivers/net/pcmcia | |
parent | 1cc745d1cdca8086b472a06671f0830fc0e98861 (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/net/pcmcia')
-rw-r--r-- | drivers/net/pcmcia/3c574_cs.c | 4 | ||||
-rw-r--r-- | drivers/net/pcmcia/3c589_cs.c | 4 | ||||
-rw-r--r-- | drivers/net/pcmcia/axnet_cs.c | 4 | ||||
-rw-r--r-- | drivers/net/pcmcia/com20020_cs.c | 4 | ||||
-rw-r--r-- | drivers/net/pcmcia/fmvj18x_cs.c | 4 | ||||
-rw-r--r-- | drivers/net/pcmcia/ibmtr_cs.c | 4 | ||||
-rw-r--r-- | drivers/net/pcmcia/nmclan_cs.c | 4 | ||||
-rw-r--r-- | drivers/net/pcmcia/pcnet_cs.c | 4 | ||||
-rw-r--r-- | drivers/net/pcmcia/smc91c92_cs.c | 4 | ||||
-rw-r--r-- | drivers/net/pcmcia/xirc2ps_cs.c | 4 |
10 files changed, 10 insertions, 30 deletions
diff --git a/drivers/net/pcmcia/3c574_cs.c b/drivers/net/pcmcia/3c574_cs.c index 8abce76367f8..ba52b0b6d93b 100644 --- a/drivers/net/pcmcia/3c574_cs.c +++ b/drivers/net/pcmcia/3c574_cs.c | |||
@@ -1196,9 +1196,7 @@ MODULE_DEVICE_TABLE(pcmcia, tc574_ids); | |||
1196 | 1196 | ||
1197 | static struct pcmcia_driver tc574_driver = { | 1197 | static struct pcmcia_driver tc574_driver = { |
1198 | .owner = THIS_MODULE, | 1198 | .owner = THIS_MODULE, |
1199 | .drv = { | 1199 | .name = "3c574_cs", |
1200 | .name = "3c574_cs", | ||
1201 | }, | ||
1202 | .probe = tc574_probe, | 1200 | .probe = tc574_probe, |
1203 | .remove = tc574_detach, | 1201 | .remove = tc574_detach, |
1204 | .id_table = tc574_ids, | 1202 | .id_table = tc574_ids, |
diff --git a/drivers/net/pcmcia/3c589_cs.c b/drivers/net/pcmcia/3c589_cs.c index 34195c407fb2..551759c25a74 100644 --- a/drivers/net/pcmcia/3c589_cs.c +++ b/drivers/net/pcmcia/3c589_cs.c | |||
@@ -953,9 +953,7 @@ MODULE_DEVICE_TABLE(pcmcia, tc589_ids); | |||
953 | 953 | ||
954 | static struct pcmcia_driver tc589_driver = { | 954 | static struct pcmcia_driver tc589_driver = { |
955 | .owner = THIS_MODULE, | 955 | .owner = THIS_MODULE, |
956 | .drv = { | 956 | .name = "3c589_cs", |
957 | .name = "3c589_cs", | ||
958 | }, | ||
959 | .probe = tc589_probe, | 957 | .probe = tc589_probe, |
960 | .remove = tc589_detach, | 958 | .remove = tc589_detach, |
961 | .id_table = tc589_ids, | 959 | .id_table = tc589_ids, |
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c index 9d9d997f2e59..fb5a39ba4801 100644 --- a/drivers/net/pcmcia/axnet_cs.c +++ b/drivers/net/pcmcia/axnet_cs.c | |||
@@ -761,9 +761,7 @@ MODULE_DEVICE_TABLE(pcmcia, axnet_ids); | |||
761 | 761 | ||
762 | static struct pcmcia_driver axnet_cs_driver = { | 762 | static struct pcmcia_driver axnet_cs_driver = { |
763 | .owner = THIS_MODULE, | 763 | .owner = THIS_MODULE, |
764 | .drv = { | 764 | .name = "axnet_cs", |
765 | .name = "axnet_cs", | ||
766 | }, | ||
767 | .probe = axnet_probe, | 765 | .probe = axnet_probe, |
768 | .remove = axnet_detach, | 766 | .remove = axnet_detach, |
769 | .id_table = axnet_ids, | 767 | .id_table = axnet_ids, |
diff --git a/drivers/net/pcmcia/com20020_cs.c b/drivers/net/pcmcia/com20020_cs.c index 039731bddc27..a5d918ea5b13 100644 --- a/drivers/net/pcmcia/com20020_cs.c +++ b/drivers/net/pcmcia/com20020_cs.c | |||
@@ -364,9 +364,7 @@ MODULE_DEVICE_TABLE(pcmcia, com20020_ids); | |||
364 | 364 | ||
365 | static struct pcmcia_driver com20020_cs_driver = { | 365 | static struct pcmcia_driver com20020_cs_driver = { |
366 | .owner = THIS_MODULE, | 366 | .owner = THIS_MODULE, |
367 | .drv = { | 367 | .name = "com20020_cs", |
368 | .name = "com20020_cs", | ||
369 | }, | ||
370 | .probe = com20020_probe, | 368 | .probe = com20020_probe, |
371 | .remove = com20020_detach, | 369 | .remove = com20020_detach, |
372 | .id_table = com20020_ids, | 370 | .id_table = com20020_ids, |
diff --git a/drivers/net/pcmcia/fmvj18x_cs.c b/drivers/net/pcmcia/fmvj18x_cs.c index 792ab38d979c..1c327598bbe8 100644 --- a/drivers/net/pcmcia/fmvj18x_cs.c +++ b/drivers/net/pcmcia/fmvj18x_cs.c | |||
@@ -697,9 +697,7 @@ MODULE_DEVICE_TABLE(pcmcia, fmvj18x_ids); | |||
697 | 697 | ||
698 | static struct pcmcia_driver fmvj18x_cs_driver = { | 698 | static struct pcmcia_driver fmvj18x_cs_driver = { |
699 | .owner = THIS_MODULE, | 699 | .owner = THIS_MODULE, |
700 | .drv = { | 700 | .name = "fmvj18x_cs", |
701 | .name = "fmvj18x_cs", | ||
702 | }, | ||
703 | .probe = fmvj18x_probe, | 701 | .probe = fmvj18x_probe, |
704 | .remove = fmvj18x_detach, | 702 | .remove = fmvj18x_detach, |
705 | .id_table = fmvj18x_ids, | 703 | .id_table = fmvj18x_ids, |
diff --git a/drivers/net/pcmcia/ibmtr_cs.c b/drivers/net/pcmcia/ibmtr_cs.c index b298a3d98dc8..d3c9f016f791 100644 --- a/drivers/net/pcmcia/ibmtr_cs.c +++ b/drivers/net/pcmcia/ibmtr_cs.c | |||
@@ -394,9 +394,7 @@ MODULE_DEVICE_TABLE(pcmcia, ibmtr_ids); | |||
394 | 394 | ||
395 | static struct pcmcia_driver ibmtr_cs_driver = { | 395 | static struct pcmcia_driver ibmtr_cs_driver = { |
396 | .owner = THIS_MODULE, | 396 | .owner = THIS_MODULE, |
397 | .drv = { | 397 | .name = "ibmtr_cs", |
398 | .name = "ibmtr_cs", | ||
399 | }, | ||
400 | .probe = ibmtr_attach, | 398 | .probe = ibmtr_attach, |
401 | .remove = ibmtr_detach, | 399 | .remove = ibmtr_detach, |
402 | .id_table = ibmtr_ids, | 400 | .id_table = ibmtr_ids, |
diff --git a/drivers/net/pcmcia/nmclan_cs.c b/drivers/net/pcmcia/nmclan_cs.c index 51bf76de6499..8e5730c42ce6 100644 --- a/drivers/net/pcmcia/nmclan_cs.c +++ b/drivers/net/pcmcia/nmclan_cs.c | |||
@@ -1533,9 +1533,7 @@ MODULE_DEVICE_TABLE(pcmcia, nmclan_ids); | |||
1533 | 1533 | ||
1534 | static struct pcmcia_driver nmclan_cs_driver = { | 1534 | static struct pcmcia_driver nmclan_cs_driver = { |
1535 | .owner = THIS_MODULE, | 1535 | .owner = THIS_MODULE, |
1536 | .drv = { | 1536 | .name = "nmclan_cs", |
1537 | .name = "nmclan_cs", | ||
1538 | }, | ||
1539 | .probe = nmclan_probe, | 1537 | .probe = nmclan_probe, |
1540 | .remove = nmclan_detach, | 1538 | .remove = nmclan_detach, |
1541 | .id_table = nmclan_ids, | 1539 | .id_table = nmclan_ids, |
diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c index ffe2587b9145..22987e6a685e 100644 --- a/drivers/net/pcmcia/pcnet_cs.c +++ b/drivers/net/pcmcia/pcnet_cs.c | |||
@@ -1748,9 +1748,7 @@ MODULE_FIRMWARE("cis/PE-200.cis"); | |||
1748 | MODULE_FIRMWARE("cis/tamarack.cis"); | 1748 | MODULE_FIRMWARE("cis/tamarack.cis"); |
1749 | 1749 | ||
1750 | static struct pcmcia_driver pcnet_driver = { | 1750 | static struct pcmcia_driver pcnet_driver = { |
1751 | .drv = { | 1751 | .name = "pcnet_cs", |
1752 | .name = "pcnet_cs", | ||
1753 | }, | ||
1754 | .probe = pcnet_probe, | 1752 | .probe = pcnet_probe, |
1755 | .remove = pcnet_detach, | 1753 | .remove = pcnet_detach, |
1756 | .owner = THIS_MODULE, | 1754 | .owner = THIS_MODULE, |
diff --git a/drivers/net/pcmcia/smc91c92_cs.c b/drivers/net/pcmcia/smc91c92_cs.c index a8cef28507de..e4c4fb626572 100644 --- a/drivers/net/pcmcia/smc91c92_cs.c +++ b/drivers/net/pcmcia/smc91c92_cs.c | |||
@@ -2090,9 +2090,7 @@ MODULE_DEVICE_TABLE(pcmcia, smc91c92_ids); | |||
2090 | 2090 | ||
2091 | static struct pcmcia_driver smc91c92_cs_driver = { | 2091 | static struct pcmcia_driver smc91c92_cs_driver = { |
2092 | .owner = THIS_MODULE, | 2092 | .owner = THIS_MODULE, |
2093 | .drv = { | 2093 | .name = "smc91c92_cs", |
2094 | .name = "smc91c92_cs", | ||
2095 | }, | ||
2096 | .probe = smc91c92_probe, | 2094 | .probe = smc91c92_probe, |
2097 | .remove = smc91c92_detach, | 2095 | .remove = smc91c92_detach, |
2098 | .id_table = smc91c92_ids, | 2096 | .id_table = smc91c92_ids, |
diff --git a/drivers/net/pcmcia/xirc2ps_cs.c b/drivers/net/pcmcia/xirc2ps_cs.c index cecc07454e9e..18cdc84a84bf 100644 --- a/drivers/net/pcmcia/xirc2ps_cs.c +++ b/drivers/net/pcmcia/xirc2ps_cs.c | |||
@@ -1832,9 +1832,7 @@ MODULE_DEVICE_TABLE(pcmcia, xirc2ps_ids); | |||
1832 | 1832 | ||
1833 | static struct pcmcia_driver xirc2ps_cs_driver = { | 1833 | static struct pcmcia_driver xirc2ps_cs_driver = { |
1834 | .owner = THIS_MODULE, | 1834 | .owner = THIS_MODULE, |
1835 | .drv = { | 1835 | .name = "xirc2ps_cs", |
1836 | .name = "xirc2ps_cs", | ||
1837 | }, | ||
1838 | .probe = xirc2ps_probe, | 1836 | .probe = xirc2ps_probe, |
1839 | .remove = xirc2ps_detach, | 1837 | .remove = xirc2ps_detach, |
1840 | .id_table = xirc2ps_ids, | 1838 | .id_table = xirc2ps_ids, |