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>

5 files changed, 19 insertions, 15 deletions

diff --git a/drivers/isdn/hardware/avm/avm_cs.c b/drivers/isdn/hardware/avm/avm_cs.c
index 3569c68dc942..a8d6949338cd 100644
--- a/drivers/isdn/hardware/avm/avm_cs.c
+++ b/drivers/isdn/hardware/avm/avm_cs.c
@@ -156,6 +156,7 @@ static void avmcs_detach(struct pcmcia_device *link)
 
 static int avmcs_configcheck(struct pcmcia_device *p_dev,
                              cistpl_cftable_entry_t *cf,
+                             cistpl_cftable_entry_t *dflt,
                              void *priv_data)
 {
         if (cf->io.nwin <= 0)
diff --git a/drivers/isdn/hisax/avma1_cs.c b/drivers/isdn/hisax/avma1_cs.c
index 76164d6a3c89..7ce1aabb0aeb 100644
--- a/drivers/isdn/hisax/avma1_cs.c
+++ b/drivers/isdn/hisax/avma1_cs.c
@@ -175,8 +175,9 @@ static void avma1cs_detach(struct pcmcia_device *link)
 ======================================================================*/
 
 static int avma1cs_configcheck(struct pcmcia_device *p_dev,
-                             cistpl_cftable_entry_t *cf,
-                             void *priv_data)
+                               cistpl_cftable_entry_t *cf,
+                               cistpl_cftable_entry_t *dflt,
+                               void *priv_data)
 {
         if (cf->io.nwin <= 0)
                 return -ENODEV;
diff --git a/drivers/isdn/hisax/elsa_cs.c b/drivers/isdn/hisax/elsa_cs.c
index c9899e51a262..29c55b0b86b4 100644
--- a/drivers/isdn/hisax/elsa_cs.c
+++ b/drivers/isdn/hisax/elsa_cs.c
@@ -206,6 +206,7 @@ static void elsa_cs_detach(struct pcmcia_device *link)
 
 static int elsa_cs_configcheck(struct pcmcia_device *p_dev,
                                cistpl_cftable_entry_t *cf,
+                               cistpl_cftable_entry_t *dflt,
                                void *priv_data)
 {
         int j;
diff --git a/drivers/isdn/hisax/sedlbauer_cs.c b/drivers/isdn/hisax/sedlbauer_cs.c
index 2c611f91cfba..2746acbd8b70 100644
--- a/drivers/isdn/hisax/sedlbauer_cs.c
+++ b/drivers/isdn/hisax/sedlbauer_cs.c
@@ -218,19 +218,17 @@ static void sedlbauer_detach(struct pcmcia_device *link)
 do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
 
 struct sedlbauer_config_data {
-        cistpl_cftable_entry_t dflt;
         config_info_t conf;
         win_req_t req;
 };
 
 static int sedlbauer_config_check(struct pcmcia_device *p_dev,
                                   cistpl_cftable_entry_t *cfg,
+                                  cistpl_cftable_entry_t *dflt,
                                   void *priv_data)
 {
         struct sedlbauer_config_data *cfg_mem = priv_data;
 
-        if (cfg->flags & CISTPL_CFTABLE_DEFAULT)
-                cfg_mem->dflt = *cfg;
         if (cfg->index == 0)
                 return -ENODEV;
 
@@ -243,26 +241,28 @@ static int sedlbauer_config_check(struct pcmcia_device *p_dev,
         /* Use power settings for Vcc and Vpp if present */
         /*  Note that the CIS values need to be rescaled */
         if (cfg->vcc.present & (1<<CISTPL_POWER_VNOM)) {
-                if (cfg_mem->conf.Vcc != cfg->vcc.param[CISTPL_POWER_VNOM]/10000)
+                if (cfg_mem->conf.Vcc !=
+                    cfg->vcc.param[CISTPL_POWER_VNOM]/10000)
                         return -ENODEV;
-        } else if (cfg_mem->dflt.vcc.present & (1<<CISTPL_POWER_VNOM)) {
-                if (cfg_mem->conf.Vcc != cfg_mem->dflt.vcc.param[CISTPL_POWER_VNOM]/10000)
+        } else if (dflt->vcc.present & (1<<CISTPL_POWER_VNOM)) {
+                if (cfg_mem->conf.Vcc !=
+                    dflt->vcc.param[CISTPL_POWER_VNOM]/10000)
                         return -ENODEV;
         }
 
         if (cfg->vpp1.present & (1<<CISTPL_POWER_VNOM))
                 p_dev->conf.Vpp = cfg->vpp1.param[CISTPL_POWER_VNOM]/10000;
-        else if (cfg_mem->dflt.vpp1.present & (1<<CISTPL_POWER_VNOM))
-                p_dev->conf.Vpp = cfg_mem->dflt.vpp1.param[CISTPL_POWER_VNOM]/10000;
+        else if (dflt->vpp1.present & (1<<CISTPL_POWER_VNOM))
+                p_dev->conf.Vpp = dflt->vpp1.param[CISTPL_POWER_VNOM]/10000;
 
         /* Do we need to allocate an interrupt? */
-        if (cfg->irq.IRQInfo1 || cfg_mem->dflt.irq.IRQInfo1)
+        if (cfg->irq.IRQInfo1 || dflt->irq.IRQInfo1)
                 p_dev->conf.Attributes |= CONF_ENABLE_IRQ;
 
         /* IO window settings */
         p_dev->io.NumPorts1 = p_dev->io.NumPorts2 = 0;
-        if ((cfg->io.nwin > 0) || (cfg_mem->dflt.io.nwin > 0)) {
-                cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &cfg_mem->dflt.io;
+        if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {
+                cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;
                 p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
                 if (!(io->flags & CISTPL_IO_8BIT))
                         p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_16;
@@ -291,8 +291,8 @@ static int sedlbauer_config_check(struct pcmcia_device *p_dev,
           needs to be mapped to virtual space with ioremap() before it
           is used.
         */
-        if ((cfg->mem.nwin > 0) || (cfg_mem->dflt.mem.nwin > 0)) {
-                cistpl_mem_t *mem = (cfg->mem.nwin) ? &cfg->mem : &cfg_mem->dflt.mem;
+        if ((cfg->mem.nwin > 0) || (dflt->mem.nwin > 0)) {
+                cistpl_mem_t *mem = (cfg->mem.nwin) ? &cfg->mem : &dflt->mem;
                 memreq_t map;
                 cfg_mem->req.Attributes = WIN_DATA_WIDTH_16|WIN_MEMORY_TYPE_CM;
                 cfg_mem->req.Attributes |= WIN_ENABLE;
diff --git a/drivers/isdn/hisax/teles_cs.c b/drivers/isdn/hisax/teles_cs.c
index ecb75ae8a399..f4f2e2231a9b 100644
--- a/drivers/isdn/hisax/teles_cs.c
+++ b/drivers/isdn/hisax/teles_cs.c
@@ -196,6 +196,7 @@ static void teles_detach(struct pcmcia_device *link)
 
 static int teles_cs_configcheck(struct pcmcia_device *p_dev,
                                 cistpl_cftable_entry_t *cf,
+                                cistpl_cftable_entry_t *dflt,
                                 void *priv_data)
 {
         int j;