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>

3 files changed, 0 insertions, 6 deletions

diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c
index 7a9eeca6adc2..a60608722495 100644
--- a/drivers/net/pcmcia/pcnet_cs.c
+++ b/drivers/net/pcmcia/pcnet_cs.c
@@ -523,8 +523,6 @@ static int pcnet_confcheck(struct pcmcia_device *p_dev,
         if (cfg->index == 0 || cfg->io.nwin == 0)
                 return -EINVAL;
 
-        p_dev->conf.ConfigIndex = cfg->index;
-
         /* For multifunction cards, by convention, we configure the
            network function with window 0, and serial with window 1 */
         if (io->nwin > 1) {
diff --git a/drivers/net/pcmcia/smc91c92_cs.c b/drivers/net/pcmcia/smc91c92_cs.c
index c012e3400736..1e595038a492 100644
--- a/drivers/net/pcmcia/smc91c92_cs.c
+++ b/drivers/net/pcmcia/smc91c92_cs.c
@@ -464,7 +464,6 @@ static int mhz_mfc_config_check(struct pcmcia_device *p_dev,
                                 void *priv_data)
 {
         int k;
-        p_dev->conf.ConfigIndex = cf->index;
         p_dev->io.BasePort2 = cf->io.win[0].base;
         for (k = 0; k < 0x400; k += 0x10) {
                 if (k & 0x80)
@@ -654,7 +653,6 @@ static int smc_configcheck(struct pcmcia_device *p_dev,
                            cistpl_cftable_entry_t *cf,
                            void *priv_data)
 {
-        p_dev->conf.ConfigIndex = cf->index;
         p_dev->io.BasePort1 = cf->io.win[0].base;
         p_dev->io.IOAddrLines = cf->io.flags & CISTPL_IO_LINES_MASK;
         return pcmcia_request_io(p_dev, &p_dev->io);
diff --git a/drivers/net/pcmcia/xirc2ps_cs.c b/drivers/net/pcmcia/xirc2ps_cs.c
index b57f022952b4..b0de704f229c 100644
--- a/drivers/net/pcmcia/xirc2ps_cs.c
+++ b/drivers/net/pcmcia/xirc2ps_cs.c
@@ -724,7 +724,6 @@ xirc2ps_config_modem(struct pcmcia_device *p_dev,
 
         if (cf->io.nwin > 0  &&  (cf->io.win[0].base & 0xf) == 8) {
                 for (ioaddr = 0x300; ioaddr < 0x400; ioaddr += 0x10) {
-                        p_dev->conf.ConfigIndex = cf->index ;
                         p_dev->io.BasePort2 = cf->io.win[0].base;
                         p_dev->io.BasePort1 = ioaddr;
                         if (!pcmcia_request_io(p_dev, &p_dev->io))
@@ -742,7 +741,6 @@ xirc2ps_config_check(struct pcmcia_device *p_dev,
         int *pass = priv_data;
 
         if (cf->io.nwin > 0 && (cf->io.win[0].base & 0xf) == 8) {
-                p_dev->conf.ConfigIndex = cf->index ;
                 p_dev->io.BasePort2 = cf->io.win[0].base;
                 p_dev->io.BasePort1 = p_dev->io.BasePort2
                         + (*pass ? (cf->index & 0x20 ? -24:8)