19 files changed, 19 insertions, 57 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);
 
 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,