pcmcia: move driver name to struct pcmcia_driver

Tested-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>

57 files changed, 67 insertions, 172 deletions

diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c
index 88cb03c36963..806292160b3f 100644
--- a/drivers/ata/pata_pcmcia.c
+++ b/drivers/ata/pata_pcmcia.c
@@ -382,9 +382,7 @@ MODULE_DEVICE_TABLE(pcmcia, pcmcia_devices);
 
 static struct pcmcia_driver pcmcia_driver = {
         .owner          = THIS_MODULE,
-        .drv = {
-                .name           = DRV_NAME,
-        },
+        .name           = DRV_NAME,
         .id_table       = pcmcia_devices,
         .probe          = pcmcia_init_one,
         .remove         = pcmcia_remove_one,
diff --git a/drivers/bluetooth/bluecard_cs.c b/drivers/bluetooth/bluecard_cs.c
index c9dd5b789d25..4104b7feae67 100644
--- a/drivers/bluetooth/bluecard_cs.c
+++ b/drivers/bluetooth/bluecard_cs.c
@@ -940,9 +940,7 @@ MODULE_DEVICE_TABLE(pcmcia, bluecard_ids);
 
 static struct pcmcia_driver bluecard_driver = {
         .owner          = THIS_MODULE,
-        .drv            = {
-                .name   = "bluecard_cs",
-        },
+        .name           = "bluecard_cs",
         .probe          = bluecard_probe,
         .remove         = bluecard_detach,
         .id_table       = bluecard_ids,
diff --git a/drivers/bluetooth/bt3c_cs.c b/drivers/bluetooth/bt3c_cs.c
index 8b8be35fe312..0c8a65587491 100644
--- a/drivers/bluetooth/bt3c_cs.c
+++ b/drivers/bluetooth/bt3c_cs.c
@@ -769,9 +769,7 @@ MODULE_DEVICE_TABLE(pcmcia, bt3c_ids);
 
 static struct pcmcia_driver bt3c_driver = {
         .owner          = THIS_MODULE,
-        .drv            = {
-                .name   = "bt3c_cs",
-        },
+        .name           = "bt3c_cs",
         .probe          = bt3c_probe,
         .remove         = bt3c_detach,
         .id_table       = bt3c_ids,
diff --git a/drivers/bluetooth/btuart_cs.c b/drivers/bluetooth/btuart_cs.c
index 9f9bb69dc0a2..f8a0708e2311 100644
--- a/drivers/bluetooth/btuart_cs.c
+++ b/drivers/bluetooth/btuart_cs.c
@@ -697,9 +697,7 @@ MODULE_DEVICE_TABLE(pcmcia, btuart_ids);
 
 static struct pcmcia_driver btuart_driver = {
         .owner          = THIS_MODULE,
-        .drv            = {
-                .name   = "btuart_cs",
-        },
+        .name           = "btuart_cs",
         .probe          = btuart_probe,
         .remove         = btuart_detach,
         .id_table       = btuart_ids,
diff --git a/drivers/bluetooth/dtl1_cs.c b/drivers/bluetooth/dtl1_cs.c
index 12cd177132fc..26ee0cf88d20 100644
--- a/drivers/bluetooth/dtl1_cs.c
+++ b/drivers/bluetooth/dtl1_cs.c
@@ -647,9 +647,7 @@ MODULE_DEVICE_TABLE(pcmcia, dtl1_ids);
 
 static struct pcmcia_driver dtl1_driver = {
         .owner          = THIS_MODULE,
-        .drv            = {
-                .name   = "dtl1_cs",
-        },
+        .name           = "dtl1_cs",
         .probe          = dtl1_probe,
         .remove         = dtl1_detach,
         .id_table       = dtl1_ids,
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);
 
 static struct pcmcia_driver cm4000_driver = {
         .owner    = THIS_MODULE,
-        .drv      = {
-                .name = "cm4000_cs",
-                },
+        .name     = "cm4000_cs",
         .probe    = cm4000_probe,
         .remove   = cm4000_detach,
         .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);
 
 static struct pcmcia_driver reader_driver = {
         .owner          = THIS_MODULE,
-        .drv            = {
-                .name   = "cm4040_cs",
-        },
+        .name           = "cm4040_cs",
         .probe          = reader_probe,
         .remove         = reader_detach,
         .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 = {
         .owner          = THIS_MODULE,
         .probe          = ipwireless_attach,
         .remove         = ipwireless_detach,
-        .drv = { .name  = IPWIRELESS_PCCARD_NAME },
+        .name           = IPWIRELESS_PCCARD_NAME,
         .id_table       = ipw_ids
 };
 
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);
 
 static struct pcmcia_driver mgslpc_driver = {
         .owner          = THIS_MODULE,
-        .drv            = {
-                .name   = "synclink_cs",
-        },
+        .name           = "synclink_cs",
         .probe          = mgslpc_probe,
         .remove         = mgslpc_detach,
         .id_table       = mgslpc_ids,
diff --git a/drivers/ide/ide-cs.c b/drivers/ide/ide-cs.c
index c389d9a28881..54702cc8e0d4 100644
--- a/drivers/ide/ide-cs.c
+++ b/drivers/ide/ide-cs.c
@@ -389,9 +389,7 @@ MODULE_DEVICE_TABLE(pcmcia, ide_ids);
 
 static struct pcmcia_driver ide_cs_driver = {
         .owner          = THIS_MODULE,
-        .drv            = {
-                .name   = "ide-cs",
-        },
+        .name           = "ide-cs",
         .probe          = ide_probe,
         .remove         = ide_detach,
         .id_table       = ide_ids,
diff --git a/drivers/isdn/hardware/avm/avm_cs.c b/drivers/isdn/hardware/avm/avm_cs.c
index 403a995bec95..b172361bbef8 100644
--- a/drivers/isdn/hardware/avm/avm_cs.c
+++ b/drivers/isdn/hardware/avm/avm_cs.c
@@ -210,9 +210,7 @@ MODULE_DEVICE_TABLE(pcmcia, avmcs_ids);
 
 static struct pcmcia_driver avmcs_driver = {
         .owner  = THIS_MODULE,
-        .drv    = {
-                .name   = "avm_cs",
-        },
+        .name           = "avm_cs",
         .probe = avmcs_probe,
         .remove = avmcs_detach,
         .id_table = avmcs_ids,
diff --git a/drivers/isdn/hisax/avma1_cs.c b/drivers/isdn/hisax/avma1_cs.c
index 47590e0a63dc..314bc86bf92b 100644
--- a/drivers/isdn/hisax/avma1_cs.c
+++ b/drivers/isdn/hisax/avma1_cs.c
@@ -210,9 +210,7 @@ MODULE_DEVICE_TABLE(pcmcia, avma1cs_ids);
 
 static struct pcmcia_driver avma1cs_driver = {
         .owner          = THIS_MODULE,
-        .drv            = {
-                .name   = "avma1_cs",
-        },
+        .name           = "avma1_cs",
         .probe          = avma1cs_probe,
         .remove         = __devexit_p(avma1cs_detach),
         .id_table       = avma1cs_ids,
diff --git a/drivers/isdn/hisax/elsa_cs.c b/drivers/isdn/hisax/elsa_cs.c
index b37b9f0f7fdc..2d439a79fd88 100644
--- a/drivers/isdn/hisax/elsa_cs.c
+++ b/drivers/isdn/hisax/elsa_cs.c
@@ -266,9 +266,7 @@ MODULE_DEVICE_TABLE(pcmcia, elsa_ids);
 
 static struct pcmcia_driver elsa_cs_driver = {
         .owner          = THIS_MODULE,
-        .drv            = {
-                .name   = "elsa_cs",
-        },
+        .name           = "elsa_cs",
         .probe          = elsa_cs_probe,
         .remove         = __devexit_p(elsa_cs_detach),
         .id_table       = elsa_ids,
diff --git a/drivers/isdn/hisax/sedlbauer_cs.c b/drivers/isdn/hisax/sedlbauer_cs.c
index ff17dba175c4..9e5c4fd08671 100644
--- a/drivers/isdn/hisax/sedlbauer_cs.c
+++ b/drivers/isdn/hisax/sedlbauer_cs.c
@@ -284,9 +284,7 @@ MODULE_DEVICE_TABLE(pcmcia, sedlbauer_ids);
 
 static struct pcmcia_driver sedlbauer_driver = {
         .owner          = THIS_MODULE,
-        .drv            = {
-                .name   = "sedlbauer_cs",
-        },
+        .name           = "sedlbauer_cs",
         .probe          = sedlbauer_probe,
         .remove         = __devexit_p(sedlbauer_detach),
         .id_table       = sedlbauer_ids,
diff --git a/drivers/isdn/hisax/teles_cs.c b/drivers/isdn/hisax/teles_cs.c
index 13ba9abfc9b5..82f09b864846 100644
--- a/drivers/isdn/hisax/teles_cs.c
+++ b/drivers/isdn/hisax/teles_cs.c
@@ -255,9 +255,7 @@ MODULE_DEVICE_TABLE(pcmcia, teles_ids);
 
 static struct pcmcia_driver teles_cs_driver = {
         .owner          = THIS_MODULE,
-        .drv            = {
-                .name   = "teles_cs",
-        },
+        .name           = "teles_cs",
         .probe          = teles_probe,
         .remove         = __devexit_p(teles_detach),
         .id_table       = teles_ids,
diff --git a/drivers/mmc/host/sdricoh_cs.c b/drivers/mmc/host/sdricoh_cs.c
index 7a7273b09d9a..f472c2714eb8 100644
--- a/drivers/mmc/host/sdricoh_cs.c
+++ b/drivers/mmc/host/sdricoh_cs.c
@@ -535,9 +535,7 @@ static int sdricoh_pcmcia_resume(struct pcmcia_device *link)
 #endif
 
 static struct pcmcia_driver sdricoh_driver = {
-        .drv = {
-                .name = DRIVER_NAME,
-                },
+        .name = DRIVER_NAME,
         .probe = sdricoh_pcmcia_probe,
         .remove = sdricoh_pcmcia_detach,
         .id_table = pcmcia_ids,
diff --git a/drivers/mtd/maps/pcmciamtd.c b/drivers/mtd/maps/pcmciamtd.c
index 388db9ecf222..214c695a2398 100644
--- a/drivers/mtd/maps/pcmciamtd.c
+++ b/drivers/mtd/maps/pcmciamtd.c
@@ -750,9 +750,7 @@ static struct pcmcia_device_id pcmciamtd_ids[] = {
 MODULE_DEVICE_TABLE(pcmcia, pcmciamtd_ids);
 
 static struct pcmcia_driver pcmciamtd_driver = {
-        .drv            = {
-                .name   = "pcmciamtd"
-        },
+        .name           = "pcmciamtd",
         .probe          = pcmciamtd_probe,
         .remove         = pcmciamtd_detach,
         .owner          = THIS_MODULE,
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);
 
 static struct pcmcia_driver tc574_driver = {
         .owner          = THIS_MODULE,
-        .drv            = {
-                .name   = "3c574_cs",
-        },
+        .name           = "3c574_cs",
         .probe          = tc574_probe,
         .remove         = tc574_detach,
         .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);
 
 static struct pcmcia_driver tc589_driver = {
         .owner          = THIS_MODULE,
-        .drv            = {
-                .name   = "3c589_cs",
-        },
+        .name           = "3c589_cs",
         .probe          = tc589_probe,
         .remove         = tc589_detach,
         .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);
 
 static struct pcmcia_driver axnet_cs_driver = {
         .owner          = THIS_MODULE,
-        .drv            = {
-                .name   = "axnet_cs",
-        },
+        .name           = "axnet_cs",
         .probe          = axnet_probe,
         .remove         = axnet_detach,
         .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);
 
 static struct pcmcia_driver com20020_cs_driver = {
         .owner          = THIS_MODULE,
-        .drv            = {
-                .name   = "com20020_cs",
-        },
+        .name           = "com20020_cs",
         .probe          = com20020_probe,
         .remove         = com20020_detach,
         .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);
 
 static struct pcmcia_driver fmvj18x_cs_driver = {
         .owner          = THIS_MODULE,
-        .drv            = {
-                .name   = "fmvj18x_cs",
-        },
+        .name           = "fmvj18x_cs",
         .probe          = fmvj18x_probe,
         .remove         = fmvj18x_detach,
         .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);
 
 static struct pcmcia_driver ibmtr_cs_driver = {
         .owner          = THIS_MODULE,
-        .drv            = {
-                .name   = "ibmtr_cs",
-        },
+        .name           = "ibmtr_cs",
         .probe          = ibmtr_attach,
         .remove         = ibmtr_detach,
         .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);
 
 static struct pcmcia_driver nmclan_cs_driver = {
         .owner          = THIS_MODULE,
-        .drv            = {
-                .name   = "nmclan_cs",
-        },
+        .name           = "nmclan_cs",
         .probe          = nmclan_probe,
         .remove         = nmclan_detach,
         .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");
 MODULE_FIRMWARE("cis/tamarack.cis");
 
 static struct pcmcia_driver pcnet_driver = {
-        .drv            = {
-                .name   = "pcnet_cs",
-        },
+        .name           = "pcnet_cs",
         .probe          = pcnet_probe,
         .remove         = pcnet_detach,
         .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);
 
 static struct pcmcia_driver smc91c92_cs_driver = {
         .owner          = THIS_MODULE,
-        .drv            = {
-                .name   = "smc91c92_cs",
-        },
+        .name           = "smc91c92_cs",
         .probe          = smc91c92_probe,
         .remove         = smc91c92_detach,
         .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);
 
 static struct pcmcia_driver xirc2ps_cs_driver = {
         .owner          = THIS_MODULE,
-        .drv            = {
-                .name   = "xirc2ps_cs",
-        },
+        .name           = "xirc2ps_cs",
         .probe          = xirc2ps_probe,
         .remove         = xirc2ps_detach,
         .id_table       = xirc2ps_ids,
diff --git a/drivers/net/wireless/airo_cs.c b/drivers/net/wireless/airo_cs.c
index 4067bf1cdeb4..0fc8f639c1d4 100644
--- a/drivers/net/wireless/airo_cs.c
+++ b/drivers/net/wireless/airo_cs.c
@@ -246,9 +246,7 @@ MODULE_DEVICE_TABLE(pcmcia, airo_ids);
 
 static struct pcmcia_driver airo_driver = {
         .owner          = THIS_MODULE,
-        .drv            = {
-                .name   = "airo_cs",
-        },
+        .name           = "airo_cs",
         .probe          = airo_probe,
         .remove         = airo_detach,
         .id_table       = airo_ids,
diff --git a/drivers/net/wireless/atmel_cs.c b/drivers/net/wireless/atmel_cs.c
index 202938022112..13c0c3b02690 100644
--- a/drivers/net/wireless/atmel_cs.c
+++ b/drivers/net/wireless/atmel_cs.c
@@ -309,9 +309,7 @@ MODULE_DEVICE_TABLE(pcmcia, atmel_ids);
 
 static struct pcmcia_driver atmel_driver = {
         .owner          = THIS_MODULE,
-        .drv            = {
-                .name   = "atmel_cs",
-        },
+        .name           = "atmel_cs",
         .probe          = atmel_probe,
         .remove         = atmel_detach,
         .id_table       = atmel_ids,
diff --git a/drivers/net/wireless/b43/pcmcia.c b/drivers/net/wireless/b43/pcmcia.c
index 61abab1f1c7c..7dcba5fafdc7 100644
--- a/drivers/net/wireless/b43/pcmcia.c
+++ b/drivers/net/wireless/b43/pcmcia.c
@@ -121,9 +121,7 @@ static void __devexit b43_pcmcia_remove(struct pcmcia_device *dev)
 
 static struct pcmcia_driver b43_pcmcia_driver = {
         .owner          = THIS_MODULE,
-        .drv            = {
-                                .name = "b43-pcmcia",
-                        },
+        .name           = "b43-pcmcia",
         .id_table       = b43_pcmcia_tbl,
         .probe          = b43_pcmcia_probe,
         .remove         = __devexit_p(b43_pcmcia_remove),
diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c
index d6ff0c7b7d94..ba645701179a 100644
--- a/drivers/net/wireless/hostap/hostap_cs.c
+++ b/drivers/net/wireless/hostap/hostap_cs.c
@@ -707,9 +707,7 @@ MODULE_DEVICE_TABLE(pcmcia, hostap_cs_ids);
 
 
 static struct pcmcia_driver hostap_driver = {
-        .drv            = {
-                .name   = "hostap_cs",
-        },
+        .name           = "hostap_cs",
         .probe          = hostap_cs_probe,
         .remove         = prism2_detach,
         .owner          = THIS_MODULE,
diff --git a/drivers/net/wireless/libertas/if_cs.c b/drivers/net/wireless/libertas/if_cs.c
index 2c6f28ac5197..c2bd2f0304bb 100644
--- a/drivers/net/wireless/libertas/if_cs.c
+++ b/drivers/net/wireless/libertas/if_cs.c
@@ -988,9 +988,7 @@ MODULE_DEVICE_TABLE(pcmcia, if_cs_ids);
 
 static struct pcmcia_driver lbs_driver = {
         .owner          = THIS_MODULE,
-        .drv            = {
-                .name   = DRV_NAME,
-        },
+        .name           = DRV_NAME,
         .probe          = if_cs_probe,
         .remove         = if_cs_detach,
         .id_table       = if_cs_ids,
diff --git a/drivers/net/wireless/orinoco/orinoco_cs.c b/drivers/net/wireless/orinoco/orinoco_cs.c
index 263dfe9e0e30..28212661f34a 100644
--- a/drivers/net/wireless/orinoco/orinoco_cs.c
+++ b/drivers/net/wireless/orinoco/orinoco_cs.c
@@ -378,9 +378,7 @@ MODULE_DEVICE_TABLE(pcmcia, orinoco_cs_ids);
 
 static struct pcmcia_driver orinoco_driver = {
         .owner          = THIS_MODULE,
-        .drv            = {
-                .name   = DRIVER_NAME,
-        },
+        .name           = DRIVER_NAME,
         .probe          = orinoco_cs_probe,
         .remove         = orinoco_cs_detach,
         .id_table       = orinoco_cs_ids,
diff --git a/drivers/net/wireless/orinoco/spectrum_cs.c b/drivers/net/wireless/orinoco/spectrum_cs.c
index 78446507873f..5906e9af9064 100644
--- a/drivers/net/wireless/orinoco/spectrum_cs.c
+++ b/drivers/net/wireless/orinoco/spectrum_cs.c
@@ -361,9 +361,7 @@ MODULE_DEVICE_TABLE(pcmcia, spectrum_cs_ids);
 
 static struct pcmcia_driver orinoco_driver = {
         .owner          = THIS_MODULE,
-        .drv            = {
-                .name   = DRIVER_NAME,
-        },
+        .name           = DRIVER_NAME,
         .probe          = spectrum_cs_probe,
         .remove         = spectrum_cs_detach,
         .suspend        = spectrum_cs_suspend,
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c
index 1457f34efa9a..b5a2c9e31de2 100644
--- a/drivers/net/wireless/ray_cs.c
+++ b/drivers/net/wireless/ray_cs.c
@@ -2843,9 +2843,7 @@ MODULE_DEVICE_TABLE(pcmcia, ray_ids);
 
 static struct pcmcia_driver ray_driver = {
         .owner = THIS_MODULE,
-        .drv = {
-                .name = "ray_cs",
-                },
+        .name = "ray_cs",
         .probe = ray_probe,
         .remove = ray_detach,
         .id_table = ray_ids,
diff --git a/drivers/net/wireless/wl3501_cs.c b/drivers/net/wireless/wl3501_cs.c
index 101b6ffd560e..d3ed38f558fa 100644
--- a/drivers/net/wireless/wl3501_cs.c
+++ b/drivers/net/wireless/wl3501_cs.c
@@ -2054,9 +2054,7 @@ MODULE_DEVICE_TABLE(pcmcia, wl3501_ids);
 
 static struct pcmcia_driver wl3501_driver = {
         .owner          = THIS_MODULE,
-        .drv            = {
-                .name   = "wl3501_cs",
-        },
+        .name           = "wl3501_cs",
         .probe          = wl3501_probe,
         .remove         = wl3501_detach,
         .id_table       = wl3501_ids,
diff --git a/drivers/parport/parport_cs.c b/drivers/parport/parport_cs.c
index 3730184a04a3..6f4c9560b2b9 100644
--- a/drivers/parport/parport_cs.c
+++ b/drivers/parport/parport_cs.c
@@ -221,9 +221,7 @@ MODULE_DEVICE_TABLE(pcmcia, parport_ids);
 
 static struct pcmcia_driver parport_cs_driver = {
         .owner          = THIS_MODULE,
-        .drv            = {
-                .name   = "parport_cs",
-        },
+        .name           = "parport_cs",
         .probe          = parport_probe,
         .remove         = parport_detach,
         .id_table       = parport_ids,
diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index 912c74082891..100c4412457d 100644
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -51,7 +51,7 @@ static void pcmcia_check_driver(struct pcmcia_driver *p_drv)
 
         if (!p_drv->probe || !p_drv->remove)
                 printk(KERN_DEBUG "pcmcia: %s lacks a requisite callback "
-                       "function\n", p_drv->drv.name);
+                       "function\n", p_drv->name);
 
         while (did && did->match_flags) {
                 for (i = 0; i < 4; i++) {
@@ -64,7 +64,7 @@ static void pcmcia_check_driver(struct pcmcia_driver *p_drv)
 
                         printk(KERN_DEBUG "pcmcia: %s: invalid hash for "
                                "product string \"%s\": is 0x%x, should "
-                               "be 0x%x\n", p_drv->drv.name, did->prod_id[i],
+                               "be 0x%x\n", p_drv->name, did->prod_id[i],
                                did->prod_id_hash[i], hash);
                         printk(KERN_DEBUG "pcmcia: see "
                                 "Documentation/pcmcia/devicetable.txt for "
@@ -179,10 +179,11 @@ int pcmcia_register_driver(struct pcmcia_driver *driver)
         /* initialize common fields */
         driver->drv.bus = &pcmcia_bus_type;
         driver->drv.owner = driver->owner;
+        driver->drv.name = driver->name;
         mutex_init(&driver->dynids.lock);
         INIT_LIST_HEAD(&driver->dynids.list);
 
-        pr_debug("registering driver %s\n", driver->drv.name);
+        pr_debug("registering driver %s\n", driver->name);
 
         error = driver_register(&driver->drv);
         if (error < 0)
@@ -202,7 +203,7 @@ EXPORT_SYMBOL(pcmcia_register_driver);
  */
 void pcmcia_unregister_driver(struct pcmcia_driver *driver)
 {
-        pr_debug("unregistering driver %s\n", driver->drv.name);
+        pr_debug("unregistering driver %s\n", driver->name);
         driver_unregister(&driver->drv);
         pcmcia_free_dynids(driver);
 }
@@ -263,7 +264,7 @@ static int pcmcia_device_probe(struct device *dev)
         p_drv = to_pcmcia_drv(dev->driver);
         s = p_dev->socket;
 
-        dev_dbg(dev, "trying to bind to %s\n", p_drv->drv.name);
+        dev_dbg(dev, "trying to bind to %s\n", p_drv->name);
 
         if ((!p_drv->probe) || (!p_dev->function_config) ||
             (!try_module_get(p_drv->owner))) {
@@ -289,10 +290,10 @@ static int pcmcia_device_probe(struct device *dev)
         ret = p_drv->probe(p_dev);
         if (ret) {
                 dev_dbg(dev, "binding to %s failed with %d\n",
-                           p_drv->drv.name, ret);
+                           p_drv->name, ret);
                 goto put_module;
         }
-        dev_dbg(dev, "%s bound: Vpp %d.%d, idx %x, IRQ %d", p_drv->drv.name,
+        dev_dbg(dev, "%s bound: Vpp %d.%d, idx %x, IRQ %d", p_drv->name,
                 p_dev->vpp/10, p_dev->vpp%10, p_dev->config_index, p_dev->irq);
         dev_dbg(dev, "resources: ioport %pR %pR iomem %pR %pR %pR",
                 p_dev->resource[0], p_dev->resource[1], p_dev->resource[2],
@@ -380,13 +381,13 @@ static int pcmcia_device_remove(struct device *dev)
         if (p_dev->_irq || p_dev->_io || p_dev->_locked)
                 dev_printk(KERN_INFO, dev,
                         "pcmcia: driver %s did not release config properly\n",
-                        p_drv->drv.name);
+                        p_drv->name);
 
         for (i = 0; i < MAX_WIN; i++)
                 if (p_dev->_win & CLIENT_WIN_REQ(i))
                         dev_printk(KERN_INFO, dev,
                           "pcmcia: driver %s did not release window properly\n",
-                           p_drv->drv.name);
+                           p_drv->name);
 
         /* references from pcmcia_probe_device */
         pcmcia_put_dev(p_dev);
@@ -1142,7 +1143,7 @@ static int pcmcia_dev_suspend(struct device *dev, pm_message_t state)
                         dev_printk(KERN_ERR, dev,
                                    "pcmcia: device %s (driver %s) did "
                                    "not want to go to sleep (%d)\n",
-                                   p_dev->devname, p_drv->drv.name, ret);
+                                   p_dev->devname, p_drv->name, ret);
                         mutex_lock(&p_dev->socket->ops_mutex);
                         p_dev->suspended = 0;
                         mutex_unlock(&p_dev->socket->ops_mutex);
diff --git a/drivers/scsi/pcmcia/aha152x_stub.c b/drivers/scsi/pcmcia/aha152x_stub.c
index bd9ce09b7ff8..49cbea33c141 100644
--- a/drivers/scsi/pcmcia/aha152x_stub.c
+++ b/drivers/scsi/pcmcia/aha152x_stub.c
@@ -216,9 +216,7 @@ MODULE_DEVICE_TABLE(pcmcia, aha152x_ids);
 
 static struct pcmcia_driver aha152x_cs_driver = {
         .owner          = THIS_MODULE,
-        .drv            = {
-                .name   = "aha152x_cs",
-        },
+        .name           = "aha152x_cs",
         .probe          = aha152x_probe,
         .remove         = aha152x_detach,
         .id_table       = aha152x_ids,
diff --git a/drivers/scsi/pcmcia/fdomain_stub.c b/drivers/scsi/pcmcia/fdomain_stub.c
index f2dc627e9da2..cd69c2670f81 100644
--- a/drivers/scsi/pcmcia/fdomain_stub.c
+++ b/drivers/scsi/pcmcia/fdomain_stub.c
@@ -188,9 +188,7 @@ MODULE_DEVICE_TABLE(pcmcia, fdomain_ids);
 
 static struct pcmcia_driver fdomain_cs_driver = {
         .owner          = THIS_MODULE,
-        .drv            = {
-                .name   = "fdomain_cs",
-        },
+        .name           = "fdomain_cs",
         .probe          = fdomain_probe,
         .remove         = fdomain_detach,
         .id_table       = fdomain_ids,
diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c
index 2b4a1a82d529..0f604d613656 100644
--- a/drivers/scsi/pcmcia/nsp_cs.c
+++ b/drivers/scsi/pcmcia/nsp_cs.c
@@ -1790,9 +1790,7 @@ MODULE_DEVICE_TABLE(pcmcia, nsp_cs_ids);
 
 static struct pcmcia_driver nsp_driver = {
         .owner          = THIS_MODULE,
-        .drv            = {
-                .name   = "nsp_cs",
-        },
+        .name           = "nsp_cs",
         .probe          = nsp_cs_probe,
         .remove         = nsp_cs_detach,
         .id_table       = nsp_cs_ids,
diff --git a/drivers/scsi/pcmcia/qlogic_stub.c b/drivers/scsi/pcmcia/qlogic_stub.c
index e8a06e3a384c..9c96ca889ec9 100644
--- a/drivers/scsi/pcmcia/qlogic_stub.c
+++ b/drivers/scsi/pcmcia/qlogic_stub.c
@@ -294,9 +294,7 @@ MODULE_DEVICE_TABLE(pcmcia, qlogic_ids);
 
 static struct pcmcia_driver qlogic_cs_driver = {
         .owner          = THIS_MODULE,
-        .drv            = {
         .name           = "qlogic_cs",
-        },
         .probe          = qlogic_probe,
         .remove         = qlogic_detach,
         .id_table       = qlogic_ids,
diff --git a/drivers/scsi/pcmcia/sym53c500_cs.c b/drivers/scsi/pcmcia/sym53c500_cs.c
index 6ceb57c355fa..0ae27cb5cd6f 100644
--- a/drivers/scsi/pcmcia/sym53c500_cs.c
+++ b/drivers/scsi/pcmcia/sym53c500_cs.c
@@ -873,9 +873,7 @@ MODULE_DEVICE_TABLE(pcmcia, sym53c500_ids);
 
 static struct pcmcia_driver sym53c500_cs_driver = {
         .owner          = THIS_MODULE,
-        .drv            = {
-                .name   = "sym53c500_cs",
-        },
+        .name           = "sym53c500_cs",
         .probe          = SYM53C500_probe,
         .remove         = SYM53C500_detach,
         .id_table       = sym53c500_ids,
diff --git a/drivers/serial/serial_cs.c b/drivers/serial/serial_cs.c
index 422520342936..5047224d2625 100644
--- a/drivers/serial/serial_cs.c
+++ b/drivers/serial/serial_cs.c
@@ -882,9 +882,7 @@ MODULE_FIRMWARE("cis/RS-COM-2P.cis");
 
 static struct pcmcia_driver serial_cs_driver = {
         .owner          = THIS_MODULE,
-        .drv            = {
-                .name   = "serial_cs",
-        },
+        .name           = "serial_cs",
         .probe          = serial_probe,
         .remove         = serial_detach,
         .id_table       = serial_ids,
diff --git a/drivers/staging/comedi/drivers/cb_das16_cs.c b/drivers/staging/comedi/drivers/cb_das16_cs.c
index 0c4b27c13eb7..a885cd7cfd7f 100644
--- a/drivers/staging/comedi/drivers/cb_das16_cs.c
+++ b/drivers/staging/comedi/drivers/cb_das16_cs.c
@@ -795,9 +795,7 @@ struct pcmcia_driver das16cs_driver = {
         .resume = das16cs_pcmcia_resume,
         .id_table = das16cs_id_table,
         .owner = THIS_MODULE,
-        .drv = {
-                .name = "cb_das16_cs",
-                },
+        .name = "cb_das16_cs",
 };
 
 static int __init init_das16cs_pcmcia_cs(void)
diff --git a/drivers/staging/comedi/drivers/das08_cs.c b/drivers/staging/comedi/drivers/das08_cs.c
index 6d893253de45..def167eac1d8 100644
--- a/drivers/staging/comedi/drivers/das08_cs.c
+++ b/drivers/staging/comedi/drivers/das08_cs.c
@@ -305,9 +305,7 @@ struct pcmcia_driver das08_cs_driver = {
         .resume = das08_pcmcia_resume,
         .id_table = das08_cs_id_table,
         .owner = THIS_MODULE,
-        .drv = {
-                .name = "pcm-das08",
-                },
+        .name = "pcm-das08",
 };
 
 static int __init init_das08_pcmcia_cs(void)
diff --git a/drivers/staging/comedi/drivers/ni_daq_700.c b/drivers/staging/comedi/drivers/ni_daq_700.c
index 52441255e2bd..9cc8401765bd 100644
--- a/drivers/staging/comedi/drivers/ni_daq_700.c
+++ b/drivers/staging/comedi/drivers/ni_daq_700.c
@@ -634,9 +634,7 @@ struct pcmcia_driver dio700_cs_driver = {
         .resume = dio700_cs_resume,
         .id_table = dio700_cs_ids,
         .owner = THIS_MODULE,
-        .drv = {
-                .name = "ni_daq_700",
-                },
+        .name = "ni_daq_700",
 };
 
 static int __init init_dio700_cs(void)
diff --git a/drivers/staging/comedi/drivers/ni_daq_dio24.c b/drivers/staging/comedi/drivers/ni_daq_dio24.c
index 54dda4a45039..b3f7c66e25c2 100644
--- a/drivers/staging/comedi/drivers/ni_daq_dio24.c
+++ b/drivers/staging/comedi/drivers/ni_daq_dio24.c
@@ -384,9 +384,7 @@ struct pcmcia_driver dio24_cs_driver = {
         .resume = dio24_cs_resume,
         .id_table = dio24_cs_ids,
         .owner = THIS_MODULE,
-        .drv = {
-                .name = "ni_daq_dio24",
-                },
+        .name = "ni_daq_dio24",
 };
 
 static int __init init_dio24_cs(void)
diff --git a/drivers/staging/comedi/drivers/ni_labpc_cs.c b/drivers/staging/comedi/drivers/ni_labpc_cs.c
index 22119f2a292e..6b7c5d043b0a 100644
--- a/drivers/staging/comedi/drivers/ni_labpc_cs.c
+++ b/drivers/staging/comedi/drivers/ni_labpc_cs.c
@@ -360,9 +360,7 @@ struct pcmcia_driver labpc_cs_driver = {
         .resume = labpc_cs_resume,
         .id_table = labpc_cs_ids,
         .owner = THIS_MODULE,
-        .drv = {
-                .name = "daqcard-1200",
-                },
+        .name = "daqcard-1200",
 };
 
 static int __init init_labpc_cs(void)
diff --git a/drivers/staging/comedi/drivers/ni_mio_cs.c b/drivers/staging/comedi/drivers/ni_mio_cs.c
index f1e31d3e12bc..49563273f605 100644
--- a/drivers/staging/comedi/drivers/ni_mio_cs.c
+++ b/drivers/staging/comedi/drivers/ni_mio_cs.c
@@ -437,9 +437,7 @@ struct pcmcia_driver ni_mio_cs_driver = {
         .resume = &mio_cs_resume,
         .id_table = ni_mio_cs_ids,
         .owner = THIS_MODULE,
-        .drv = {
-                .name = "ni_mio_cs",
-                },
+        .name = "ni_mio_cs",
 };
 
 int init_module(void)
diff --git a/drivers/staging/comedi/drivers/quatech_daqp_cs.c b/drivers/staging/comedi/drivers/quatech_daqp_cs.c
index de37ff70a9e7..32fecf57868d 100644
--- a/drivers/staging/comedi/drivers/quatech_daqp_cs.c
+++ b/drivers/staging/comedi/drivers/quatech_daqp_cs.c
@@ -1168,9 +1168,7 @@ static struct pcmcia_driver daqp_cs_driver = {
         .resume = daqp_cs_resume,
         .id_table = daqp_cs_id_table,
         .owner = THIS_MODULE,
-        .drv = {
-                .name = "quatech_daqp_cs",
-                },
+        .name = "quatech_daqp_cs",
 };
 
 int __init init_module(void)
diff --git a/drivers/staging/wlags49_h2/wl_cs.c b/drivers/staging/wlags49_h2/wl_cs.c
index 62a70afa3e29..aa3cc516fe18 100644
--- a/drivers/staging/wlags49_h2/wl_cs.c
+++ b/drivers/staging/wlags49_h2/wl_cs.c
@@ -455,9 +455,7 @@ MODULE_DEVICE_TABLE(pcmcia, wl_adapter_ids);
 
 static struct pcmcia_driver wlags49_driver = {
         .owner      = THIS_MODULE,
-        .drv        = {
-                .name = DRIVER_NAME,
-        },
+        .name       = DRIVER_NAME,
         .probe      = wl_adapter_attach,
         .remove     = wl_adapter_detach,
         .id_table   = wl_adapter_ids,
diff --git a/drivers/telephony/ixj_pcmcia.c b/drivers/telephony/ixj_pcmcia.c
index 76edd39525de..d005b9eeebbc 100644
--- a/drivers/telephony/ixj_pcmcia.c
+++ b/drivers/telephony/ixj_pcmcia.c
@@ -165,9 +165,7 @@ MODULE_DEVICE_TABLE(pcmcia, ixj_ids);
 
 static struct pcmcia_driver ixj_driver = {
         .owner          = THIS_MODULE,
-        .drv            = {
-                .name   = "ixj_cs",
-        },
+        .name           = "ixj_cs",
         .probe          = ixj_probe,
         .remove         = ixj_detach,
         .id_table       = ixj_ids,
diff --git a/drivers/usb/host/sl811_cs.c b/drivers/usb/host/sl811_cs.c
index 9ce95cdfc9ef..3775c035a6c5 100644
--- a/drivers/usb/host/sl811_cs.c
+++ b/drivers/usb/host/sl811_cs.c
@@ -195,9 +195,7 @@ MODULE_DEVICE_TABLE(pcmcia, sl811_ids);
 
 static struct pcmcia_driver sl811_cs_driver = {
         .owner          = THIS_MODULE,
-        .drv            = {
-                .name   = "sl811_cs",
-        },
+        .name           = "sl811_cs",
         .probe          = sl811_cs_probe,
         .remove         = sl811_cs_detach,
         .id_table       = sl811_ids,
diff --git a/include/pcmcia/ds.h b/include/pcmcia/ds.h
index 0b8c8d45df47..d830c87ff0a7 100644
--- a/include/pcmcia/ds.h
+++ b/include/pcmcia/ds.h
@@ -47,6 +47,8 @@ struct pcmcia_dynids {
 };
 
 struct pcmcia_driver {
+        const char              *name;
+
         int (*probe)            (struct pcmcia_device *dev);
         void (*remove)          (struct pcmcia_device *dev);
 
diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf.c b/sound/pcmcia/pdaudiocf/pdaudiocf.c
index 2476d5f0a14f..8cc4733698a0 100644
--- a/sound/pcmcia/pdaudiocf/pdaudiocf.c
+++ b/sound/pcmcia/pdaudiocf/pdaudiocf.c
@@ -287,9 +287,7 @@ MODULE_DEVICE_TABLE(pcmcia, snd_pdacf_ids);
 
 static struct pcmcia_driver pdacf_cs_driver = {
         .owner          = THIS_MODULE,
-        .drv            = {
-                .name   = "snd-pdaudiocf",
-        },
+        .name           = "snd-pdaudiocf",
         .probe          = snd_pdacf_probe,
         .remove         = snd_pdacf_detach,
         .id_table       = snd_pdacf_ids,
diff --git a/sound/pcmcia/vx/vxpocket.c b/sound/pcmcia/vx/vxpocket.c
index 017a8d6c510d..80000d631f88 100644
--- a/sound/pcmcia/vx/vxpocket.c
+++ b/sound/pcmcia/vx/vxpocket.c
@@ -358,9 +358,7 @@ MODULE_DEVICE_TABLE(pcmcia, vxp_ids);
 
 static struct pcmcia_driver vxp_cs_driver = {
         .owner          = THIS_MODULE,
-        .drv            = {
-                .name   = "snd-vxpocket",
-        },
+        .name           = "snd-vxpocket",
         .probe          = vxpocket_probe,
         .remove         = vxpocket_detach,
         .id_table       = vxp_ids,