pcmcia: pcmcia_config_loop() default CIS entry handling

Many drivers use the default CIS entry within their pcmcia_config_loop()
callback function. Therefore, factor the default CIS entry handling out.

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

1 files changed, 2 insertions, 6 deletions

diff --git a/drivers/telephony/ixj_pcmcia.c b/drivers/telephony/ixj_pcmcia.c
index ba2c7a2125a0..b41df211b786 100644
--- a/drivers/telephony/ixj_pcmcia.c
+++ b/drivers/telephony/ixj_pcmcia.c
@@ -126,10 +126,9 @@ static void ixj_get_serial(struct pcmcia_device * link, IXJ * j)
 
 static int ixj_config_check(struct pcmcia_device *p_dev,
                             cistpl_cftable_entry_t *cfg,
+                            cistpl_cftable_entry_t *dflt,
                             void *priv_data)
 {
-        cistpl_cftable_entry_t *dflt = priv_data;
-
         if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {
                 cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;
                 p_dev->io.BasePort1 = io->win[0].base;
@@ -138,10 +137,7 @@ static int ixj_config_check(struct pcmcia_device *p_dev,
                         p_dev->io.BasePort2 = io->win[1].base;
                         p_dev->io.NumPorts2 = io->win[1].len;
                 }
-                if (pcmcia_request_io(p_dev, &p_dev->io)) {
-                        if (cfg->flags & CISTPL_CFTABLE_DEFAULT)
-                                *dflt = *cfg;
-                } else
+                if (!pcmcia_request_io(p_dev, &p_dev->io))
                         return 0;
         }
         return -ENODEV;