pcmcia: pcmcia_config_loop() ConfigIndex unification

Almost all drivers set p_dev->conf.ConfigIndex to cfg->index in
the pcmcia_config_loop() callback function. Therefore, factor it out.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>

5 files changed, 0 insertions, 7 deletions

diff --git a/drivers/isdn/hardware/avm/avm_cs.c b/drivers/isdn/hardware/avm/avm_cs.c
index 7a1ead117d11..3569c68dc942 100644
--- a/drivers/isdn/hardware/avm/avm_cs.c
+++ b/drivers/isdn/hardware/avm/avm_cs.c
@@ -161,7 +161,6 @@ static int avmcs_configcheck(struct pcmcia_device *p_dev,
         if (cf->io.nwin <= 0)
                 return -ENODEV;
 
-        p_dev->conf.ConfigIndex = cf->index;
         p_dev->io.BasePort1 = cf->io.win[0].base;
         p_dev->io.NumPorts1 = cf->io.win[0].len;
         p_dev->io.NumPorts2 = 0;
diff --git a/drivers/isdn/hisax/avma1_cs.c b/drivers/isdn/hisax/avma1_cs.c
index 8142d9fc8147..76164d6a3c89 100644
--- a/drivers/isdn/hisax/avma1_cs.c
+++ b/drivers/isdn/hisax/avma1_cs.c
@@ -181,7 +181,6 @@ static int avma1cs_configcheck(struct pcmcia_device *p_dev,
         if (cf->io.nwin <= 0)
                 return -ENODEV;
 
-        p_dev->conf.ConfigIndex = cf->index;
         p_dev->io.BasePort1 = cf->io.win[0].base;
         p_dev->io.NumPorts1 = cf->io.win[0].len;
         p_dev->io.NumPorts2 = 0;
diff --git a/drivers/isdn/hisax/elsa_cs.c b/drivers/isdn/hisax/elsa_cs.c
index 449800898dcf..c9899e51a262 100644
--- a/drivers/isdn/hisax/elsa_cs.c
+++ b/drivers/isdn/hisax/elsa_cs.c
@@ -212,13 +212,11 @@ static int elsa_cs_configcheck(struct pcmcia_device *p_dev,
 
         if ((cf->io.nwin > 0) && cf->io.win[0].base) {
                 printk(KERN_INFO "(elsa_cs: looks like the 96 model)\n");
-                p_dev->conf.ConfigIndex = cf->index;
                 p_dev->io.BasePort1 = cf->io.win[0].base;
                 if (!pcmcia_request_io(p_dev, &p_dev->io))
                         return 0;
         } else {
                 printk(KERN_INFO "(elsa_cs: looks like the 97 model)\n");
-                p_dev->conf.ConfigIndex = cf->index;
                 for (j = 0x2f0; j > 0x100; j -= 0x10) {
                         p_dev->io.BasePort1 = j;
                         if (!pcmcia_request_io(p_dev, &p_dev->io))
diff --git a/drivers/isdn/hisax/sedlbauer_cs.c b/drivers/isdn/hisax/sedlbauer_cs.c
index 0f80b5667ea1..2c611f91cfba 100644
--- a/drivers/isdn/hisax/sedlbauer_cs.c
+++ b/drivers/isdn/hisax/sedlbauer_cs.c
@@ -233,7 +233,6 @@ static int sedlbauer_config_check(struct pcmcia_device *p_dev,
                 cfg_mem->dflt = *cfg;
         if (cfg->index == 0)
                 return -ENODEV;
-        p_dev->conf.ConfigIndex = cfg->index;
 
         /* Does this card need audio output? */
         if (cfg->flags & CISTPL_CFTABLE_AUDIO) {
diff --git a/drivers/isdn/hisax/teles_cs.c b/drivers/isdn/hisax/teles_cs.c
index 2b063a2916f4..ecb75ae8a399 100644
--- a/drivers/isdn/hisax/teles_cs.c
+++ b/drivers/isdn/hisax/teles_cs.c
@@ -202,13 +202,11 @@ static int teles_cs_configcheck(struct pcmcia_device *p_dev,
 
         if ((cf->io.nwin > 0) && cf->io.win[0].base) {
                 printk(KERN_INFO "(teles_cs: looks like the 96 model)\n");
-                p_dev->conf.ConfigIndex = cf->index;
                 p_dev->io.BasePort1 = cf->io.win[0].base;
                 if (!pcmcia_request_io(p_dev, &p_dev->io))
                         return 0;
         } else {
                 printk(KERN_INFO "(teles_cs: looks like the 97 model)\n");
-                p_dev->conf.ConfigIndex = cf->index;
                 for (j = 0x2f0; j > 0x100; j -= 0x10) {
                         p_dev->io.BasePort1 = j;
                         if (!pcmcia_request_io(p_dev, &p_dev->io))