pcmcia: move config_{base,index,regs} to struct pcmcia_device

Several drivers prefer to explicitly set config_{base,index,regs},
formerly known as ConfigBase, ConfigIndex and Present. Instead of
passing these values inside config_req_t, store it in struct
pcmcia_device.

CC: netdev@vger.kernel.org
CC: linux-wireless@vger.kernel.org
CC: linux-ide@vger.kernel.org
CC: linux-usb@vger.kernel.org
CC: laforge@gnumonks.org
CC: linux-mtd@lists.infradead.org
CC: alsa-devel@alsa-project.org
CC: linux-serial@vger.kernel.org
CC: Jiri Kosina <jkosina@suse.cz>
CC: linux-scsi@vger.kernel.org
Acked-by: Gustavo F. Padovan <padovan@profusion.mobi> (for drivers/bluetooth)
Tested-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>

41 files changed, 88 insertions, 92 deletions

diff --git a/drivers/bluetooth/bluecard_cs.c b/drivers/bluetooth/bluecard_cs.c
index 4cb2dfebde8..08f4818ad9f 100644
--- a/drivers/bluetooth/bluecard_cs.c
+++ b/drivers/bluetooth/bluecard_cs.c
@@ -885,7 +885,7 @@ static int bluecard_config(struct pcmcia_device *link)
         bluecard_info_t *info = link->priv;
         int i, n;
 
-        link->conf.ConfigIndex = 0x20;
+        link->config_index = 0x20;
 
         link->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
         link->resource[0]->end = 64;
diff --git a/drivers/char/pcmcia/ipwireless/main.c b/drivers/char/pcmcia/ipwireless/main.c
index 0f0be4df7b7..05c4e6834a6 100644
--- a/drivers/char/pcmcia/ipwireless/main.c
+++ b/drivers/char/pcmcia/ipwireless/main.c
@@ -92,7 +92,7 @@ static int ipwireless_probe(struct pcmcia_device *p_dev,
 
         /* 0x40 causes it to generate level mode interrupts. */
         /* 0x04 enables IREQ pin. */
-        p_dev->conf.ConfigIndex = cfg->index | 0x44;
+        p_dev->config_index = cfg->index | 0x44;
         p_dev->io_lines = 16;
         ret = pcmcia_request_io(p_dev);
         if (ret)
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
index ba7ccf5701e..535aa0899e9 100644
--- a/drivers/char/pcmcia/synclink_cs.c
+++ b/drivers/char/pcmcia/synclink_cs.c
@@ -594,8 +594,8 @@ static int mgslpc_config(struct pcmcia_device *link)
             goto failed;
 
     link->conf.Attributes = CONF_ENABLE_IRQ;
-    link->conf.ConfigIndex = 8;
-    link->conf.Present = PRESENT_OPTION;
+    link->config_index = 8;
+    link->config_regs = PRESENT_OPTION;
 
     ret = pcmcia_request_irq(link, mgslpc_isr);
     if (ret)
@@ -608,7 +608,7 @@ static int mgslpc_config(struct pcmcia_device *link)
     info->irq_level = link->irq;
 
     dev_info(&link->dev, "index 0x%02x:",
-            link->conf.ConfigIndex);
+            link->config_index);
     if (link->conf.Attributes & CONF_ENABLE_IRQ)
             printk(", irq %d", link->irq);
     if (link->resource[0])
diff --git a/drivers/ide/ide-cs.c b/drivers/ide/ide-cs.c
index cf7cb4953aa..07e37876559 100644
--- a/drivers/ide/ide-cs.c
+++ b/drivers/ide/ide-cs.c
@@ -227,8 +227,7 @@ static int pcmcia_check_one_config(struct pcmcia_device *pdev,
         if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {
                 cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;
                 pdev->io_lines = io->flags & CISTPL_IO_LINES_MASK;
-
-                pdev->conf.ConfigIndex = cfg->index;
+                pdev->config_index = cfg->index;
                 pdev->resource[0]->start = io->win[0].base;
                 if (!(io->flags & CISTPL_IO_16BIT)) {
                         pdev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;
diff --git a/drivers/isdn/hardware/avm/avm_cs.c b/drivers/isdn/hardware/avm/avm_cs.c
index 938ca4155c3..2d8bbbf286a 100644
--- a/drivers/isdn/hardware/avm/avm_cs.c
+++ b/drivers/isdn/hardware/avm/avm_cs.c
@@ -80,8 +80,8 @@ static int avmcs_probe(struct pcmcia_device *p_dev)
 
     /* General socket configuration */
     p_dev->conf.Attributes = CONF_ENABLE_IRQ;
-    p_dev->conf.ConfigIndex = 1;
-    p_dev->conf.Present = PRESENT_OPTION;
+    p_dev->config_index = 1;
+    p_dev->config_regs = PRESENT_OPTION;
 
     return avmcs_config(p_dev);
 } /* avmcs_attach */
diff --git a/drivers/isdn/hisax/avma1_cs.c b/drivers/isdn/hisax/avma1_cs.c
index 7d5ff20b5d5..e25f6c7376e 100644
--- a/drivers/isdn/hisax/avma1_cs.c
+++ b/drivers/isdn/hisax/avma1_cs.c
@@ -85,8 +85,8 @@ static int __devinit avma1cs_probe(struct pcmcia_device *p_dev)
 
     /* General socket configuration */
     p_dev->conf.Attributes = CONF_ENABLE_IRQ;
-    p_dev->conf.ConfigIndex = 1;
-    p_dev->conf.Present = PRESENT_OPTION;
+    p_dev->config_index = 1;
+    p_dev->config_regs = PRESENT_OPTION;
 
     return avma1cs_config(p_dev);
 } /* avma1cs_attach */
diff --git a/drivers/isdn/hisax/elsa_cs.c b/drivers/isdn/hisax/elsa_cs.c
index df360c8b31c..f276e842896 100644
--- a/drivers/isdn/hisax/elsa_cs.c
+++ b/drivers/isdn/hisax/elsa_cs.c
@@ -211,7 +211,7 @@ static int __devinit elsa_cs_config(struct pcmcia_device *link)
 
     /* Finally, report what we've done */
     dev_info(&link->dev, "index 0x%02x: ",
-            link->conf.ConfigIndex);
+            link->config_index);
     if (link->conf.Attributes & CONF_ENABLE_IRQ)
         printk(", irq %d", link->irq);
     if (link->resource[0])
diff --git a/drivers/isdn/hisax/sedlbauer_cs.c b/drivers/isdn/hisax/sedlbauer_cs.c
index 169061fbca9..43d0a4e97ea 100644
--- a/drivers/isdn/hisax/sedlbauer_cs.c
+++ b/drivers/isdn/hisax/sedlbauer_cs.c
@@ -253,7 +253,7 @@ static int __devinit sedlbauer_config(struct pcmcia_device *link)
 
     /* Finally, report what we've done */
     dev_info(&link->dev, "index 0x%02x:",
-           link->conf.ConfigIndex);
+           link->config_index);
     if (link->vpp)
         printk(", Vpp %d.%d", link->vpp/10, link->vpp%10);
     if (link->conf.Attributes & CONF_ENABLE_IRQ)
diff --git a/drivers/isdn/hisax/teles_cs.c b/drivers/isdn/hisax/teles_cs.c
index 46e72a1eed2..614afc64b5b 100644
--- a/drivers/isdn/hisax/teles_cs.c
+++ b/drivers/isdn/hisax/teles_cs.c
@@ -191,7 +191,7 @@ static int __devinit teles_cs_config(struct pcmcia_device *link)
 
     /* Finally, report what we've done */
     dev_info(&link->dev, "index 0x%02x:",
-            link->conf.ConfigIndex);
+            link->config_index);
     if (link->conf.Attributes & CONF_ENABLE_IRQ)
             printk(", irq %d", link->irq);
     if (link->resource[0])
diff --git a/drivers/mtd/maps/pcmciamtd.c b/drivers/mtd/maps/pcmciamtd.c
index 663b48bc657..99c7257363d 100644
--- a/drivers/mtd/maps/pcmciamtd.c
+++ b/drivers/mtd/maps/pcmciamtd.c
@@ -575,7 +575,7 @@ static int pcmciamtd_config(struct pcmcia_device *link)
                 link->vpp = 0;
         }
 
-        link->conf.ConfigIndex = 0;
+        link->config_index = 0;
         DEBUG(2, "Setting Configuration");
         ret = pcmcia_request_configuration(link, &link->conf);
         if (ret != 0) {
diff --git a/drivers/net/pcmcia/3c574_cs.c b/drivers/net/pcmcia/3c574_cs.c
index 41ecb2728a2..4b670b3da37 100644
--- a/drivers/net/pcmcia/3c574_cs.c
+++ b/drivers/net/pcmcia/3c574_cs.c
@@ -281,7 +281,7 @@ static int tc574_probe(struct pcmcia_device *link)
         link->resource[0]->end = 32;
         link->resource[0]->flags |= IO_DATA_PATH_WIDTH_16;
         link->conf.Attributes = CONF_ENABLE_IRQ;
-        link->conf.ConfigIndex = 1;
+        link->config_index = 1;
 
         dev->netdev_ops = &el3_netdev_ops;
         SET_ETHTOOL_OPS(dev, &netdev_ethtool_ops);
diff --git a/drivers/net/pcmcia/3c589_cs.c b/drivers/net/pcmcia/3c589_cs.c
index 68886729375..6549e2c496a 100644
--- a/drivers/net/pcmcia/3c589_cs.c
+++ b/drivers/net/pcmcia/3c589_cs.c
@@ -217,7 +217,7 @@ static int tc589_probe(struct pcmcia_device *link)
     link->resource[0]->flags |= IO_DATA_PATH_WIDTH_16;
 
     link->conf.Attributes = CONF_ENABLE_IRQ;
-    link->conf.ConfigIndex = 1;
+    link->config_index = 1;
 
     dev->netdev_ops = &el3_netdev_ops;
     dev->watchdog_timeo = TX_TIMEOUT;
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c
index 4d4928a22b1..2c273ce6a5d 100644
--- a/drivers/net/pcmcia/axnet_cs.c
+++ b/drivers/net/pcmcia/axnet_cs.c
@@ -230,7 +230,7 @@ static int get_prom(struct pcmcia_device *link)
     };
 
     /* Not much of a test, but the alternatives are messy */
-    if (link->conf.ConfigBase != 0x03c0)
+    if (link->config_base != 0x03c0)
         return 0;
 
     axnet_reset_8390(dev);
@@ -297,7 +297,7 @@ static int axnet_configcheck(struct pcmcia_device *p_dev,
         if (cfg->index == 0 || cfg->io.nwin == 0)
                 return -ENODEV;
 
-        p_dev->conf.ConfigIndex = 0x05;
+        p_dev->config_index = 0x05;
         /* For multifunction cards, by convention, we configure the
            network function with window 0, and serial with window 1 */
         if (io->nwin > 1) {
@@ -325,7 +325,7 @@ static int axnet_config(struct pcmcia_device *link)
     dev_dbg(&link->dev, "axnet_config(0x%p)\n", link);
 
     /* don't trust the CIS on this; Linksys got it wrong */
-    link->conf.Present = 0x63;
+    link->config_regs = 0x63;
     ret = pcmcia_loop_config(link, axnet_configcheck, NULL);
     if (ret != 0)
         goto failed;
diff --git a/drivers/net/pcmcia/fmvj18x_cs.c b/drivers/net/pcmcia/fmvj18x_cs.c
index caf2b2ef4e3..23f5333d802 100644
--- a/drivers/net/pcmcia/fmvj18x_cs.c
+++ b/drivers/net/pcmcia/fmvj18x_cs.c
@@ -312,7 +312,7 @@ static int ungermann_try_io_port(struct pcmcia_device *link)
         ret = pcmcia_request_io(link);
         if (ret == 0) {
             /* calculate ConfigIndex value */
-            link->conf.ConfigIndex = 
+            link->config_index =
                 ((link->resource[0]->start & 0x0f0) >> 3) | 0x22;
             return ret;
         }
@@ -361,28 +361,28 @@ static int fmvj18x_config(struct pcmcia_device *link)
                 link->card_id == PRODID_TDK_NP9610 ||
                 link->card_id == PRODID_TDK_MN3200) {
                 /* MultiFunction Card */
-                link->conf.ConfigBase = 0x800;
-                link->conf.ConfigIndex = 0x47;
+                link->config_base = 0x800;
+                link->config_index = 0x47;
                 link->resource[1]->end = 8;
             }
             break;
         case MANFID_NEC:
             cardtype = NEC; /* MultiFunction Card */
-            link->conf.ConfigBase = 0x800;
-            link->conf.ConfigIndex = 0x47;
+            link->config_base = 0x800;
+            link->config_index = 0x47;
             link->resource[1]->end = 8;
             break;
         case MANFID_KME:
             cardtype = KME; /* MultiFunction Card */
-            link->conf.ConfigBase = 0x800;
-            link->conf.ConfigIndex = 0x47;
+            link->config_base = 0x800;
+            link->config_index = 0x47;
             link->resource[1]->end = 8;
             break;
         case MANFID_CONTEC:
             cardtype = CONTEC;
             break;
         case MANFID_FUJITSU:
-            if (link->conf.ConfigBase == 0x0fe0)
+            if (link->config_base == 0x0fe0)
                 cardtype = MBH10302;
             else if (link->card_id == PRODID_FUJITSU_MBH10302) 
                 /* RATOC REX-5588/9822/4886's PRODID are 0004(=MBH10302),
@@ -402,10 +402,10 @@ static int fmvj18x_config(struct pcmcia_device *link)
         case MANFID_FUJITSU:
             if (link->card_id == PRODID_FUJITSU_MBH10304) {
                 cardtype = XXX10304;    /* MBH10304 with buggy CIS */
-                link->conf.ConfigIndex = 0x20;
+                link->config_index = 0x20;
             } else {
                 cardtype = MBH10302;    /* NextCom NC5310, etc. */
-                link->conf.ConfigIndex = 1;
+                link->config_index = 1;
             }
             break;
         case MANFID_UNGERMANN:
@@ -413,7 +413,7 @@ static int fmvj18x_config(struct pcmcia_device *link)
             break;
         default:
             cardtype = MBH10302;
-            link->conf.ConfigIndex = 1;
+            link->config_index = 1;
         }
     }
 
diff --git a/drivers/net/pcmcia/ibmtr_cs.c b/drivers/net/pcmcia/ibmtr_cs.c
index 1327f086d86..feedeeb17a5 100644
--- a/drivers/net/pcmcia/ibmtr_cs.c
+++ b/drivers/net/pcmcia/ibmtr_cs.c
@@ -153,7 +153,7 @@ static int __devinit ibmtr_attach(struct pcmcia_device *link)
     link->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
     link->resource[0]->end = 4;
     link->conf.Attributes = CONF_ENABLE_IRQ;
-    link->conf.Present = PRESENT_OPTION;
+    link->config_regs = PRESENT_OPTION;
 
     info->dev = dev;
 
@@ -212,8 +212,8 @@ static int __devinit ibmtr_config(struct pcmcia_device *link)
 
     dev_dbg(&link->dev, "ibmtr_config\n");
 
-    link->conf.ConfigIndex = 0x61;
     link->io_lines = 16;
+    link->config_index = 0x61;
 
     /* Determine if this is PRIMARY or ALTERNATE. */
 
diff --git a/drivers/net/pcmcia/nmclan_cs.c b/drivers/net/pcmcia/nmclan_cs.c
index 90d172804bf..98c4a697604 100644
--- a/drivers/net/pcmcia/nmclan_cs.c
+++ b/drivers/net/pcmcia/nmclan_cs.c
@@ -461,8 +461,8 @@ static int nmclan_probe(struct pcmcia_device *link)
     link->resource[0]->end = 32;
     link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
     link->conf.Attributes = CONF_ENABLE_IRQ;
-    link->conf.ConfigIndex = 1;
-    link->conf.Present = PRESENT_OPTION;
+    link->config_index = 1;
+    link->config_regs = PRESENT_OPTION;
 
     lp->tx_free_frames=AM2150_MAX_TX_FRAMES;
 
diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c
index 69135761719..68c46751f84 100644
--- a/drivers/net/pcmcia/pcnet_cs.c
+++ b/drivers/net/pcmcia/pcnet_cs.c
@@ -420,7 +420,7 @@ static hw_info_t *get_ax88190(struct pcmcia_device *link)
     int i, j;
 
     /* Not much of a test, but the alternatives are messy */
-    if (link->conf.ConfigBase != 0x03c0)
+    if (link->config_base != 0x03c0)
         return NULL;
 
     outb_p(0x01, ioaddr + EN0_DCFG);    /* Set word-wide access. */
@@ -564,7 +564,7 @@ static hw_info_t *pcnet_try_config(struct pcmcia_device *link,
 
         if ((link->manf_id == MANFID_IBM) &&
             (link->card_id == PRODID_IBM_HOME_AND_AWAY))
-                link->conf.ConfigIndex |= 0x10;
+                link->config_index |= 0x10;
 
         ret = pcmcia_request_configuration(link, &link->conf);
         if (ret)
@@ -581,7 +581,7 @@ static hw_info_t *pcnet_try_config(struct pcmcia_device *link,
         } else
                 dev->if_port = 0;
 
-        if ((link->conf.ConfigBase == 0x03c0) &&
+        if ((link->config_base == 0x03c0) &&
             (link->manf_id == 0x149) && (link->card_id == 0xc1ab)) {
                 dev_info(&link->dev,
                         "this is an AX88190 card - use axnet_cs instead.\n");
diff --git a/drivers/net/pcmcia/smc91c92_cs.c b/drivers/net/pcmcia/smc91c92_cs.c
index 2c2a8788c07..59f5034e8d9 100644
--- a/drivers/net/pcmcia/smc91c92_cs.c
+++ b/drivers/net/pcmcia/smc91c92_cs.c
@@ -411,9 +411,9 @@ static int mhz_3288_power(struct pcmcia_device *link)
     mdelay(200);
 
     /* Now read and write the COR... */
-    tmp = readb(smc->base + link->conf.ConfigBase + CISREG_COR);
+    tmp = readb(smc->base + link->config_base + CISREG_COR);
     udelay(5);
-    writeb(tmp, smc->base + link->conf.ConfigBase + CISREG_COR);
+    writeb(tmp, smc->base + link->config_base + CISREG_COR);
 
     return 0;
 }
@@ -464,7 +464,7 @@ static int mhz_mfc_config(struct pcmcia_device *link)
 
     smc->base = ioremap(link->resource[2]->start,
                     resource_size(link->resource[2]));
-    offset = (smc->manfid == MANFID_MOTOROLA) ? link->conf.ConfigBase : 0;
+    offset = (smc->manfid == MANFID_MOTOROLA) ? link->config_base : 0;
     i = pcmcia_map_mem_page(link, link->resource[2], offset);
     if ((i == 0) &&
         (smc->manfid == MANFID_MEGAHERTZ) &&
@@ -643,8 +643,8 @@ static int osi_config(struct pcmcia_device *link)
     link->resource[1]->end = 8;
 
     /* Enable Hard Decode, LAN, Modem */
-    link->conf.ConfigIndex = 0x23;
     link->io_lines = 16;
+    link->config_index = 0x23;
 
     for (i = j = 0; j < 4; j++) {
         link->resource[1]->start = com[j];
@@ -654,7 +654,7 @@ static int osi_config(struct pcmcia_device *link)
     }
     if (i != 0) {
         /* Fallback: turn off hard decode */
-        link->conf.ConfigIndex = 0x03;
+        link->config_index = 0x03;
         link->resource[1]->end = 0;
         i = pcmcia_request_io(link);
     }
diff --git a/drivers/net/pcmcia/xirc2ps_cs.c b/drivers/net/pcmcia/xirc2ps_cs.c
index 1776f49e091..1c8ebf2df0c 100644
--- a/drivers/net/pcmcia/xirc2ps_cs.c
+++ b/drivers/net/pcmcia/xirc2ps_cs.c
@@ -530,7 +530,7 @@ xirc2ps_probe(struct pcmcia_device *link)
 
     /* General socket configuration */
     link->conf.Attributes = CONF_ENABLE_IRQ;
-    link->conf.ConfigIndex = 1;
+    link->config_index = 1;
 
     /* Fill in card specific entries */
     dev->netdev_ops = &netdev_ops;
diff --git a/drivers/net/wireless/airo_cs.c b/drivers/net/wireless/airo_cs.c
index ccb2fdde002..40f9ed760bb 100644
--- a/drivers/net/wireless/airo_cs.c
+++ b/drivers/net/wireless/airo_cs.c
@@ -240,7 +240,7 @@ static int airo_config(struct pcmcia_device *link)
 
         /* Finally, report what we've done */
         dev_info(&link->dev, "index 0x%02x: ",
-               link->conf.ConfigIndex);
+               link->config_index);
         if (link->vpp)
                 printk(", Vpp %d.%d", link->vpp/10, link->vpp%10);
         printk(", irq %d", link->irq);
diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c
index 0fe6f82cda5..5704d3f9e1b 100644
--- a/drivers/net/wireless/hostap/hostap_cs.c
+++ b/drivers/net/wireless/hostap/hostap_cs.c
@@ -601,7 +601,7 @@ static int prism2_config(struct pcmcia_device *link)
 
         /* Finally, report what we've done */
         printk(KERN_INFO "%s: index 0x%02x: ",
-               dev_info, link->conf.ConfigIndex);
+               dev_info, link->config_index);
         if (link->vpp)
                 printk(", Vpp %d.%d", link->vpp / 10,
                        link->vpp % 10);
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c
index 30cfd8890e3..7fb66cc1e9f 100644
--- a/drivers/net/wireless/ray_cs.c
+++ b/drivers/net/wireless/ray_cs.c
@@ -319,7 +319,7 @@ static int ray_probe(struct pcmcia_device *p_dev)
 
         /* General socket configuration */
         p_dev->conf.Attributes = CONF_ENABLE_IRQ;
-        p_dev->conf.ConfigIndex = 1;
+        p_dev->config_index = 1;
 
         p_dev->priv = dev;
 
diff --git a/drivers/net/wireless/wl3501_cs.c b/drivers/net/wireless/wl3501_cs.c
index 92a9ad575cc..3947cf8e63c 100644
--- a/drivers/net/wireless/wl3501_cs.c
+++ b/drivers/net/wireless/wl3501_cs.c
@@ -1889,7 +1889,7 @@ static int wl3501_probe(struct pcmcia_device *p_dev)
 
         /* General socket configuration */
         p_dev->conf.Attributes  = CONF_ENABLE_IRQ;
-        p_dev->conf.ConfigIndex = 1;
+        p_dev->config_index     = 1;
 
         dev = alloc_etherdev(sizeof(struct wl3501_card));
         if (!dev)
diff --git a/drivers/parport/parport_cs.c b/drivers/parport/parport_cs.c
index afd946e15ee..8faf634987e 100644
--- a/drivers/parport/parport_cs.c
+++ b/drivers/parport/parport_cs.c
@@ -144,7 +144,7 @@ static int parport_config_check(struct pcmcia_device *p_dev,
                 cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;
                 p_dev->io_lines = io->flags & CISTPL_IO_LINES_MASK;
                 if (epp_mode)
-                        p_dev->conf.ConfigIndex |= FORCE_EPP_MODE;
+                        p_dev->config_index |= FORCE_EPP_MODE;
                 p_dev->resource[0]->start = io->win[0].base;
                 p_dev->resource[0]->end = io->win[0].len;
                 if (io->nwin == 2) {
diff --git a/drivers/pcmcia/cs_internal.h b/drivers/pcmcia/cs_internal.h
index a0c5adb37b5..42eef437afd 100644
--- a/drivers/pcmcia/cs_internal.h
+++ b/drivers/pcmcia/cs_internal.h
@@ -34,9 +34,6 @@ typedef struct config_t {
         struct kref     ref;
         unsigned int    state;
         unsigned int    Attributes;
-        unsigned int    ConfigBase;
-        unsigned char   Option;
-        unsigned int    CardValues;
 
         struct resource io[MAX_IO_WIN]; /* io ports */
         struct resource mem[MAX_WIN];   /* mem areas */
diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index 55570d9e1e4..00db60053f9 100644
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -276,13 +276,13 @@ static int pcmcia_device_probe(struct device *dev)
         ret = pccard_read_tuple(p_dev->socket, p_dev->func, CISTPL_CONFIG,
                                 &cis_config);
         if (!ret) {
-                p_dev->conf.ConfigBase = cis_config.base;
-                p_dev->conf.Present = cis_config.rmask[0];
+                p_dev->config_base = cis_config.base;
+                p_dev->config_regs = cis_config.rmask[0];
         } else {
                 dev_printk(KERN_INFO, dev,
                            "pcmcia: could not parse base and rmask0 of CIS\n");
-                p_dev->conf.ConfigBase = 0;
-                p_dev->conf.Present = 0;
+                p_dev->config_base = 0;
+                p_dev->config_regs = 0;
         }
 
         ret = p_drv->probe(p_dev);
diff --git a/drivers/pcmcia/pcmcia_cis.c b/drivers/pcmcia/pcmcia_cis.c
index 0ac54da1588..ac47cc4e20e 100644
--- a/drivers/pcmcia/pcmcia_cis.c
+++ b/drivers/pcmcia/pcmcia_cis.c
@@ -151,7 +151,7 @@ static int pcmcia_do_loop_config(tuple_t *tuple, cisparse_t *parse, void *priv)
         struct pcmcia_cfg_mem *cfg_mem = priv;
 
         /* default values */
-        cfg_mem->p_dev->conf.ConfigIndex = cfg->index;
+        cfg_mem->p_dev->config_index = cfg->index;
         if (cfg->flags & CISTPL_CFTABLE_DEFAULT)
                 cfg_mem->dflt = *cfg;
 
diff --git a/drivers/pcmcia/pcmcia_resource.c b/drivers/pcmcia/pcmcia_resource.c
index 6210e1c2b43..a1fb0dc1a71 100644
--- a/drivers/pcmcia/pcmcia_resource.c
+++ b/drivers/pcmcia/pcmcia_resource.c
@@ -168,7 +168,7 @@ static int pcmcia_access_config(struct pcmcia_device *p_dev,
                 return -EACCES;
         }
 
-        addr = (c->ConfigBase + where) >> 1;
+        addr = (p_dev->config_base + where) >> 1;
 
         ret = accessf(s, 1, addr, 1, val);
 
@@ -443,6 +443,7 @@ int pcmcia_request_configuration(struct pcmcia_device *p_dev,
         pccard_io_map iomap;
         unsigned char status = 0;
         unsigned char ext_status = 0;
+        unsigned char option = 0;
 
         if (!(s->state & SOCKET_PRESENT))
                 return -ENODEV;
@@ -473,7 +474,7 @@ int pcmcia_request_configuration(struct pcmcia_device *p_dev,
         if (req->Attributes & CONF_ENABLE_SPKR) {
                 s->socket.flags |= SS_SPKR_ENA;
                 status = CCSR_AUDIO_ENA;
-                if (!(req->Present & PRESENT_STATUS))
+                if (!(p_dev->config_regs & PRESENT_STATUS))
                         dev_warn(&p_dev->dev, "speaker requested, but "
                                               "PRESENT_STATUS not set!\n");
         }
@@ -482,54 +483,53 @@ int pcmcia_request_configuration(struct pcmcia_device *p_dev,
         else
                 s->socket.io_irq = 0;
         if (req->Attributes & CONF_ENABLE_ESR) {
-                req->Present |= PRESENT_EXT_STATUS;
+                p_dev->config_regs |= PRESENT_EXT_STATUS;
                 ext_status = ESR_REQ_ATTN_ENA;
         }
         s->ops->set_socket(s, &s->socket);
         s->lock_count++;
 
         /* Set up CIS configuration registers */
-        base = c->ConfigBase = req->ConfigBase;
-        c->CardValues = req->Present;
-        if (req->Present & PRESENT_COPY) {
+        base = p_dev->config_base;
+        if (p_dev->config_regs & PRESENT_COPY) {
                 u16 tmp = 0;
                 dev_dbg(&p_dev->dev, "clearing CISREG_SCR\n");
                 pcmcia_write_cis_mem(s, 1, (base + CISREG_SCR)>>1, 1, &tmp);
         }
-        if (req->Present & PRESENT_PIN_REPLACE) {
+        if (p_dev->config_regs & PRESENT_PIN_REPLACE) {
                 u16 tmp = 0;
                 dev_dbg(&p_dev->dev, "clearing CISREG_PRR\n");
                 pcmcia_write_cis_mem(s, 1, (base + CISREG_PRR)>>1, 1, &tmp);
         }
-        if (req->Present & PRESENT_OPTION) {
+        if (p_dev->config_regs & PRESENT_OPTION) {
                 if (s->functions == 1) {
-                        c->Option = req->ConfigIndex & COR_CONFIG_MASK;
+                        option = p_dev->config_index & COR_CONFIG_MASK;
                 } else {
-                        c->Option = req->ConfigIndex & COR_MFC_CONFIG_MASK;
-                        c->Option |= COR_FUNC_ENA|COR_IREQ_ENA;
-                        if (req->Present & PRESENT_IOBASE_0)
-                                c->Option |= COR_ADDR_DECODE;
+                        option = p_dev->config_index & COR_MFC_CONFIG_MASK;
+                        option |= COR_FUNC_ENA|COR_IREQ_ENA;
+                        if (p_dev->config_regs & PRESENT_IOBASE_0)
+                                option |= COR_ADDR_DECODE;
                 }
                 if ((req->Attributes & CONF_ENABLE_IRQ) &&
                         !(req->Attributes & CONF_ENABLE_PULSE_IRQ))
-                        c->Option |= COR_LEVEL_REQ;
-                pcmcia_write_cis_mem(s, 1, (base + CISREG_COR)>>1, 1, &c->Option);
+                        option |= COR_LEVEL_REQ;
+                pcmcia_write_cis_mem(s, 1, (base + CISREG_COR)>>1, 1, &option);
                 mdelay(40);
         }
-        if (req->Present & PRESENT_STATUS)
+        if (p_dev->config_regs & PRESENT_STATUS)
                 pcmcia_write_cis_mem(s, 1, (base + CISREG_CCSR)>>1, 1, &status);
 
-        if (req->Present & PRESENT_EXT_STATUS)
+        if (p_dev->config_regs & PRESENT_EXT_STATUS)
                 pcmcia_write_cis_mem(s, 1, (base + CISREG_ESR)>>1, 1,
                                         &ext_status);
 
-        if (req->Present & PRESENT_IOBASE_0) {
+        if (p_dev->config_regs & PRESENT_IOBASE_0) {
                 u8 b = c->io[0].start & 0xff;
                 pcmcia_write_cis_mem(s, 1, (base + CISREG_IOBASE_0)>>1, 1, &b);
                 b = (c->io[0].start >> 8) & 0xff;
                 pcmcia_write_cis_mem(s, 1, (base + CISREG_IOBASE_1)>>1, 1, &b);
         }
-        if (req->Present & PRESENT_IOSIZE) {
+        if (p_dev->config_regs & PRESENT_IOSIZE) {
                 u8 b = resource_size(&c->io[0]) + resource_size(&c->io[1]) - 1;
                 pcmcia_write_cis_mem(s, 1, (base + CISREG_IOSIZE)>>1, 1, &b);
         }
diff --git a/drivers/scsi/pcmcia/aha152x_stub.c b/drivers/scsi/pcmcia/aha152x_stub.c
index 3c0046e89f3..c3682492af1 100644
--- a/drivers/scsi/pcmcia/aha152x_stub.c
+++ b/drivers/scsi/pcmcia/aha152x_stub.c
@@ -103,7 +103,7 @@ static int aha152x_probe(struct pcmcia_device *link)
     link->resource[0]->end = 0x20;
     link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
     link->conf.Attributes = CONF_ENABLE_IRQ;
-    link->conf.Present = PRESENT_OPTION;
+    link->config_regs = PRESENT_OPTION;
 
     return aha152x_config_cs(link);
 } /* aha152x_attach */
diff --git a/drivers/scsi/pcmcia/fdomain_stub.c b/drivers/scsi/pcmcia/fdomain_stub.c
index 8ff760380d8..bb909e1b7c6 100644
--- a/drivers/scsi/pcmcia/fdomain_stub.c
+++ b/drivers/scsi/pcmcia/fdomain_stub.c
@@ -86,7 +86,7 @@ static int fdomain_probe(struct pcmcia_device *link)
         link->resource[0]->end = 0x10;
         link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
         link->conf.Attributes = CONF_ENABLE_IRQ;
-        link->conf.Present = PRESENT_OPTION;
+        link->config_regs = PRESENT_OPTION;
 
         return fdomain_config(link);
 } /* fdomain_attach */
diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c
index c0cf2dfd6fb..a5648e9c4f6 100644
--- a/drivers/scsi/pcmcia/nsp_cs.c
+++ b/drivers/scsi/pcmcia/nsp_cs.c
@@ -1745,7 +1745,7 @@ static int nsp_cs_config(struct pcmcia_device *link)
 
         /* Finally, report what we've done */
         printk(KERN_INFO "nsp_cs: index 0x%02x: ",
-               link->conf.ConfigIndex);
+               link->config_index);
         if (link->vpp) {
                 printk(", Vpp %d.%d", link->vpp/10, link->vpp%10);
         }
diff --git a/drivers/scsi/pcmcia/qlogic_stub.c b/drivers/scsi/pcmcia/qlogic_stub.c
index 77f46a279d6..5e2cbe09140 100644
--- a/drivers/scsi/pcmcia/qlogic_stub.c
+++ b/drivers/scsi/pcmcia/qlogic_stub.c
@@ -159,7 +159,7 @@ static int qlogic_probe(struct pcmcia_device *link)
         link->resource[0]->end = 16;
         link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
         link->conf.Attributes = CONF_ENABLE_IRQ;
-        link->conf.Present = PRESENT_OPTION;
+        link->config_regs = PRESENT_OPTION;
 
         return qlogic_config(link);
 }                               /* qlogic_attach */
diff --git a/drivers/serial/serial_cs.c b/drivers/serial/serial_cs.c
index 38baede2a77..ee19f2d25c2 100644
--- a/drivers/serial/serial_cs.c
+++ b/drivers/serial/serial_cs.c
@@ -495,7 +495,7 @@ static int simple_config(struct pcmcia_device *link)
 
 found_port:
         if (info->multi && (info->manfid == MANFID_3COM))
-                link->conf.ConfigIndex &= ~(0x08);
+                link->config_index &= ~(0x08);
 
         /*
          * Apply any configuration quirks.
@@ -591,8 +591,8 @@ static int multi_config(struct pcmcia_device *link)
                                 info->prodid == PRODID_POSSIO_GCC)) {
                 int err;
 
-                if (link->conf.ConfigIndex == 1 ||
-                    link->conf.ConfigIndex == 3) {
+                if (link->config_index == 1 ||
+                    link->config_index == 3) {
                         err = setup_serial(link, info, base2,
                                         link->irq);
                         base2 = link->resource[0]->start;;
diff --git a/drivers/staging/comedi/drivers/cb_das16_cs.c b/drivers/staging/comedi/drivers/cb_das16_cs.c
index 11271b61f65..034cbfcba19 100644
--- a/drivers/staging/comedi/drivers/cb_das16_cs.c
+++ b/drivers/staging/comedi/drivers/cb_das16_cs.c
@@ -772,7 +772,7 @@ static void das16cs_pcmcia_config(struct pcmcia_device *link)
                 goto failed;
 
         /* Finally, report what we've done */
-        dev_info(&link->dev, "index 0x%02x", link->conf.ConfigIndex);
+        dev_info(&link->dev, "index 0x%02x", link->config_index);
         if (link->conf.Attributes & CONF_ENABLE_IRQ)
                 printk(", irq %u", link->irq);
         if (link->resource[0])
diff --git a/drivers/staging/comedi/drivers/das08_cs.c b/drivers/staging/comedi/drivers/das08_cs.c
index 319aad48ec2..e37ea79e6ae 100644
--- a/drivers/staging/comedi/drivers/das08_cs.c
+++ b/drivers/staging/comedi/drivers/das08_cs.c
@@ -268,7 +268,7 @@ static void das08_pcmcia_config(struct pcmcia_device *link)
                 goto failed;
 
         /* Finally, report what we've done */
-        dev_info(&link->dev, "index 0x%02x", link->conf.ConfigIndex);
+        dev_info(&link->dev, "index 0x%02x", link->config_index);
         if (link->conf.Attributes & CONF_ENABLE_IRQ)
                 printk(", irq %u", link->irq);
         if (link->resource[0])
diff --git a/drivers/staging/comedi/drivers/ni_daq_700.c b/drivers/staging/comedi/drivers/ni_daq_700.c
index d269bbdf5cf..8107e400924 100644
--- a/drivers/staging/comedi/drivers/ni_daq_700.c
+++ b/drivers/staging/comedi/drivers/ni_daq_700.c
@@ -607,7 +607,7 @@ static void dio700_config(struct pcmcia_device *link)
                 goto failed;
 
         /* Finally, report what we've done */
-        dev_info(&link->dev, "index 0x%02x", link->conf.ConfigIndex);
+        dev_info(&link->dev, "index 0x%02x", link->config_index);
         if (link->conf.Attributes & CONF_ENABLE_IRQ)
                 printk(", irq %d", link->irq);
         if (link->resource[0])
diff --git a/drivers/staging/comedi/drivers/ni_daq_dio24.c b/drivers/staging/comedi/drivers/ni_daq_dio24.c
index fcaa82967b9..4f9daa3558a 100644
--- a/drivers/staging/comedi/drivers/ni_daq_dio24.c
+++ b/drivers/staging/comedi/drivers/ni_daq_dio24.c
@@ -358,7 +358,7 @@ static void dio24_config(struct pcmcia_device *link)
                 goto failed;
 
         /* Finally, report what we've done */
-        dev_info(&link->dev, "index 0x%02x", link->conf.ConfigIndex);
+        dev_info(&link->dev, "index 0x%02x", link->config_index);
         if (link->conf.Attributes & CONF_ENABLE_IRQ)
                 printk(", irq %d", link->irq);
         if (link->resource[0])
diff --git a/drivers/staging/comedi/drivers/ni_labpc_cs.c b/drivers/staging/comedi/drivers/ni_labpc_cs.c
index a936c11e7dc..2e27a3048cb 100644
--- a/drivers/staging/comedi/drivers/ni_labpc_cs.c
+++ b/drivers/staging/comedi/drivers/ni_labpc_cs.c
@@ -336,7 +336,7 @@ static void labpc_config(struct pcmcia_device *link)
                 goto failed;
 
         /* Finally, report what we've done */
-        dev_info(&link->dev, "index 0x%02x", link->conf.ConfigIndex);
+        dev_info(&link->dev, "index 0x%02x", link->config_index);
         if (link->conf.Attributes & CONF_ENABLE_IRQ)
                 printk(", irq %d", link->irq);
         if (link->resource[0])
diff --git a/drivers/staging/comedi/drivers/quatech_daqp_cs.c b/drivers/staging/comedi/drivers/quatech_daqp_cs.c
index cd818fbd918..a2a32de044c 100644
--- a/drivers/staging/comedi/drivers/quatech_daqp_cs.c
+++ b/drivers/staging/comedi/drivers/quatech_daqp_cs.c
@@ -1137,7 +1137,7 @@ static void daqp_cs_config(struct pcmcia_device *link)
                 goto failed;
 
         /* Finally, report what we've done */
-        dev_info(&link->dev, "index 0x%02x", link->conf.ConfigIndex);
+        dev_info(&link->dev, "index 0x%02x", link->config_index);
         if (link->conf.Attributes & CONF_ENABLE_IRQ)
                 printk(", irq %u", link->irq);
         if (link->resource[0])
diff --git a/drivers/staging/wlags49_h2/wl_cs.c b/drivers/staging/wlags49_h2/wl_cs.c
index b2efff692ad..778800f1e46 100644
--- a/drivers/staging/wlags49_h2/wl_cs.c
+++ b/drivers/staging/wlags49_h2/wl_cs.c
@@ -148,8 +148,8 @@ static int wl_adapter_attach(struct pcmcia_device *link)
         link->resource[0]->end  = HCF_NUM_IO_PORTS;
         link->resource[0]->flags= IO_DATA_PATH_WIDTH_16;
         link->conf.Attributes   = CONF_ENABLE_IRQ;
-        link->conf.ConfigIndex  = 5;
-        link->conf.Present      = PRESENT_OPTION;
+        link->config_index      = 5;
+        link->config_regs       = PRESENT_OPTION;
 
         link->priv = dev;
         lp = wl_priv(dev);
diff --git a/drivers/usb/host/sl811_cs.c b/drivers/usb/host/sl811_cs.c
index 78bad518814..590405361be 100644
--- a/drivers/usb/host/sl811_cs.c
+++ b/drivers/usb/host/sl811_cs.c
@@ -200,7 +200,7 @@ static int sl811_cs_config(struct pcmcia_device *link)
                 goto failed;
 
         dev_info(&link->dev, "index 0x%02x: ",
-                link->conf.ConfigIndex);
+                link->config_index);
         if (link->vpp)
                 printk(", Vpp %d.%d", link->vpp/10, link->vpp%10);
         printk(", irq %d", link->irq);