pcmcia: move driver name to struct pcmcia_driver

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

4 files changed, 4 insertions, 12 deletions

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,