pcmcia: move driver name to struct pcmcia_driver
Dominik Brodowski [Sun, 8 Aug 2010 09:36:26 +0000 (11:36 +0200)]
Tested-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>

57 files changed:
drivers/ata/pata_pcmcia.c
drivers/bluetooth/bluecard_cs.c
drivers/bluetooth/bt3c_cs.c
drivers/bluetooth/btuart_cs.c
drivers/bluetooth/dtl1_cs.c
drivers/char/pcmcia/cm4000_cs.c
drivers/char/pcmcia/cm4040_cs.c
drivers/char/pcmcia/ipwireless/main.c
drivers/char/pcmcia/synclink_cs.c
drivers/ide/ide-cs.c
drivers/isdn/hardware/avm/avm_cs.c
drivers/isdn/hisax/avma1_cs.c
drivers/isdn/hisax/elsa_cs.c
drivers/isdn/hisax/sedlbauer_cs.c
drivers/isdn/hisax/teles_cs.c
drivers/mmc/host/sdricoh_cs.c
drivers/mtd/maps/pcmciamtd.c
drivers/net/pcmcia/3c574_cs.c
drivers/net/pcmcia/3c589_cs.c
drivers/net/pcmcia/axnet_cs.c
drivers/net/pcmcia/com20020_cs.c
drivers/net/pcmcia/fmvj18x_cs.c
drivers/net/pcmcia/ibmtr_cs.c
drivers/net/pcmcia/nmclan_cs.c
drivers/net/pcmcia/pcnet_cs.c
drivers/net/pcmcia/smc91c92_cs.c
drivers/net/pcmcia/xirc2ps_cs.c
drivers/net/wireless/airo_cs.c
drivers/net/wireless/atmel_cs.c
drivers/net/wireless/b43/pcmcia.c
drivers/net/wireless/hostap/hostap_cs.c
drivers/net/wireless/libertas/if_cs.c
drivers/net/wireless/orinoco/orinoco_cs.c
drivers/net/wireless/orinoco/spectrum_cs.c
drivers/net/wireless/ray_cs.c
drivers/net/wireless/wl3501_cs.c
drivers/parport/parport_cs.c
drivers/pcmcia/ds.c
drivers/scsi/pcmcia/aha152x_stub.c
drivers/scsi/pcmcia/fdomain_stub.c
drivers/scsi/pcmcia/nsp_cs.c
drivers/scsi/pcmcia/qlogic_stub.c
drivers/scsi/pcmcia/sym53c500_cs.c
drivers/serial/serial_cs.c
drivers/staging/comedi/drivers/cb_das16_cs.c
drivers/staging/comedi/drivers/das08_cs.c
drivers/staging/comedi/drivers/ni_daq_700.c
drivers/staging/comedi/drivers/ni_daq_dio24.c
drivers/staging/comedi/drivers/ni_labpc_cs.c
drivers/staging/comedi/drivers/ni_mio_cs.c
drivers/staging/comedi/drivers/quatech_daqp_cs.c
drivers/staging/wlags49_h2/wl_cs.c
drivers/telephony/ixj_pcmcia.c
drivers/usb/host/sl811_cs.c
include/pcmcia/ds.h
sound/pcmcia/pdaudiocf/pdaudiocf.c
sound/pcmcia/vx/vxpocket.c

index 88cb03c..8062921 100644 (file)
@@ -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,
index c9dd5b7..4104b7f 100644 (file)
@@ -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,
index 8b8be35..0c8a655 100644 (file)
@@ -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,
index 9f9bb69..f8a0708 100644 (file)
@@ -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,
index 12cd177..26ee0cf 100644 (file)
@@ -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,
index 79de9cc..e932526 100644 (file)
@@ -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,
index bf012d2..d7e2bec 100644 (file)
@@ -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,
index 594c23b..a1b8083 100644 (file)
@@ -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
 };
 
index 7c71913..493dba5 100644 (file)
@@ -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,
index c389d9a..54702cc 100644 (file)
@@ -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,
index 403a995..b172361 100644 (file)
@@ -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,
index 47590e0..314bc86 100644 (file)
@@ -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,
index b37b9f0..2d439a7 100644 (file)
@@ -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,
index ff17dba..9e5c4fd 100644 (file)
@@ -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,
index 13ba9ab..82f09b8 100644 (file)
@@ -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,
index 7a7273b..f472c27 100644 (file)
@@ -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,
index 388db9e..214c695 100644 (file)
@@ -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,
index 8abce76..ba52b0b 100644 (file)
@@ -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,
index 34195c4..551759c 100644 (file)
@@ -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,
index 9d9d997..fb5a39b 100644 (file)
@@ -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,
index 039731b..a5d918e 100644 (file)
@@ -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,
index 792ab38..1c32759 100644 (file)
@@ -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,
index b298a3d..d3c9f01 100644 (file)
@@ -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,
index 51bf76d..8e5730c 100644 (file)
@@ -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,
index ffe2587..22987e6 100644 (file)
@@ -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,
index a8cef28..e4c4fb6 100644 (file)
@@ -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,
index cecc074..18cdc84 100644 (file)
@@ -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,
index 4067bf1..0fc8f63 100644 (file)
@@ -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,
index 2029380..13c0c3b 100644 (file)
@@ -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,
index 61abab1..7dcba5f 100644 (file)
@@ -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),
index d6ff0c7..ba64570 100644 (file)
@@ -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,
index 2c6f28a..c2bd2f0 100644 (file)
@@ -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,
index 263dfe9..2821266 100644 (file)
@@ -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,
index 7844650..5906e9a 100644 (file)
@@ -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,
index 1457f34..b5a2c9e 100644 (file)
@@ -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,
index 101b6ff..d3ed38f 100644 (file)
@@ -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,
index 3730184..6f4c956 100644 (file)
@@ -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,
index 912c740..100c441 100644 (file)
@@ -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);
index bd9ce09..49cbea3 100644 (file)
@@ -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,
index f2dc627..cd69c26 100644 (file)
@@ -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,
index 2b4a1a8..0f604d6 100644 (file)
@@ -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,
index e8a06e3..9c96ca8 100644 (file)
@@ -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,
index 6ceb57c..0ae27cb 100644 (file)
@@ -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,
index 4225203..5047224 100644 (file)
@@ -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,
index 0c4b27c..a885cd7 100644 (file)
@@ -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)
index 6d89325..def167e 100644 (file)
@@ -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)
index 5244125..9cc8401 100644 (file)
@@ -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)
index 54dda4a..b3f7c66 100644 (file)
@@ -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)
index 22119f2..6b7c5d0 100644 (file)
@@ -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)
index f1e31d3..4956327 100644 (file)
@@ -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)
index de37ff7..32fecf5 100644 (file)
@@ -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)
index 62a70af..aa3cc51 100644 (file)
@@ -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,
index 76edd39..d005b9e 100644 (file)
@@ -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,
index 9ce95cd..3775c03 100644 (file)
@@ -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,
index 0b8c8d4..d830c87 100644 (file)
@@ -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);
 
index 2476d5f..8cc4733 100644 (file)
@@ -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,
index 017a8d6..80000d6 100644 (file)
@@ -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,