pcmcia: move driver name to struct pcmcia_driver

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

5 files changed, 5 insertions, 15 deletions

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,