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>

2 files changed, 5 insertions, 5 deletions

diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf.c b/sound/pcmcia/pdaudiocf/pdaudiocf.c
index 2e1282de77d4..4df07fce637f 100644
--- a/sound/pcmcia/pdaudiocf/pdaudiocf.c
+++ b/sound/pcmcia/pdaudiocf/pdaudiocf.c
@@ -143,8 +143,8 @@ static int snd_pdacf_probe(struct pcmcia_device *link)
         link->resource[0]->end = 16;
 
         link->conf.Attributes = CONF_ENABLE_IRQ | CONF_ENABLE_PULSE_IRQ;
-        link->conf.ConfigIndex = 1;
-        link->conf.Present = PRESENT_OPTION;
+        link->config_index = 1;
+        link->config_regs = PRESENT_OPTION;
 
         return pdacf_config(link);
 }
@@ -216,7 +216,7 @@ static int pdacf_config(struct pcmcia_device *link)
         int ret;
 
         snd_printdd(KERN_DEBUG "pdacf_config called\n");
-        link->conf.ConfigIndex = 0x5;
+        link->config_index = 0x5;
 
         ret = pcmcia_request_io(link);
         if (ret)
diff --git a/sound/pcmcia/vx/vxpocket.c b/sound/pcmcia/vx/vxpocket.c
index a48b3ee71377..16186adc1bdc 100644
--- a/sound/pcmcia/vx/vxpocket.c
+++ b/sound/pcmcia/vx/vxpocket.c
@@ -163,8 +163,8 @@ static int snd_vxpocket_new(struct snd_card *card, int ibl,
         link->resource[0]->end = 16;
 
         link->conf.Attributes = CONF_ENABLE_IRQ;
-        link->conf.ConfigIndex = 1;
-        link->conf.Present = PRESENT_OPTION;
+        link->config_index = 1;
+        link->config_regs = PRESENT_OPTION;
 
         *chip_ret = vxp;
         return 0;