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, 4 insertions, 14 deletions

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,