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>

9 files changed, 58 insertions, 68 deletions

diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c
index 04ece0b77d1d..c99dc5d54d19 100644
--- a/drivers/net/pcmcia/axnet_cs.c
+++ b/drivers/net/pcmcia/axnet_cs.c
@@ -286,6 +286,7 @@ static int try_io_port(struct pcmcia_device *link)
 
 static int axnet_configcheck(struct pcmcia_device *p_dev,
                              cistpl_cftable_entry_t *cfg,
+                             cistpl_cftable_entry_t *dflt,
                              void *priv_data)
 {
         int i;
diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c
index a60608722495..10fc537804b0 100644
--- a/drivers/net/pcmcia/pcnet_cs.c
+++ b/drivers/net/pcmcia/pcnet_cs.c
@@ -514,6 +514,7 @@ static int try_io_port(struct pcmcia_device *link)
 
 static int pcnet_confcheck(struct pcmcia_device *p_dev,
                            cistpl_cftable_entry_t *cfg,
+                           cistpl_cftable_entry_t *dflt,
                            void *priv_data)
 {
         int *has_shmem = priv_data;
diff --git a/drivers/net/pcmcia/smc91c92_cs.c b/drivers/net/pcmcia/smc91c92_cs.c
index 1e595038a492..05bca83c5e27 100644
--- a/drivers/net/pcmcia/smc91c92_cs.c
+++ b/drivers/net/pcmcia/smc91c92_cs.c
@@ -461,6 +461,7 @@ static int mhz_3288_power(struct pcmcia_device *link)
 
 static int mhz_mfc_config_check(struct pcmcia_device *p_dev,
                                 cistpl_cftable_entry_t *cf,
+                                cistpl_cftable_entry_t *dflt,
                                 void *priv_data)
 {
         int k;
@@ -651,6 +652,7 @@ static int mot_setup(struct pcmcia_device *link)
 
 static int smc_configcheck(struct pcmcia_device *p_dev,
                            cistpl_cftable_entry_t *cf,
+                           cistpl_cftable_entry_t *dflt,
                            void *priv_data)
 {
         p_dev->io.BasePort1 = cf->io.win[0].base;
diff --git a/drivers/net/pcmcia/xirc2ps_cs.c b/drivers/net/pcmcia/xirc2ps_cs.c
index b0de704f229c..a16efa49b855 100644
--- a/drivers/net/pcmcia/xirc2ps_cs.c
+++ b/drivers/net/pcmcia/xirc2ps_cs.c
@@ -718,6 +718,7 @@ has_ce2_string(struct pcmcia_device * p_dev)
 static int
 xirc2ps_config_modem(struct pcmcia_device *p_dev,
                      cistpl_cftable_entry_t *cf,
+                     cistpl_cftable_entry_t *dflt,
                      void *priv_data)
 {
         unsigned int ioaddr;
@@ -736,6 +737,7 @@ xirc2ps_config_modem(struct pcmcia_device *p_dev,
 static int
 xirc2ps_config_check(struct pcmcia_device *p_dev,
                      cistpl_cftable_entry_t *cf,
+                     cistpl_cftable_entry_t *dflt,
                      void *priv_data)
 {
         int *pass = priv_data;
diff --git a/drivers/net/wireless/airo_cs.c b/drivers/net/wireless/airo_cs.c
index d7216730f18e..657adf85ab77 100644
--- a/drivers/net/wireless/airo_cs.c
+++ b/drivers/net/wireless/airo_cs.c
@@ -206,19 +206,12 @@ static void airo_detach(struct pcmcia_device *link)
 #define CS_CHECK(fn, ret) \
 do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
 
-struct airo_cs_config_data {
-        cistpl_cftable_entry_t dflt;
-        win_req_t req;
-};
-
 static int airo_cs_config_check(struct pcmcia_device *p_dev,
                                 cistpl_cftable_entry_t *cfg,
+                                cistpl_cftable_entry_t *dflt,
                                 void *priv_data)
 {
-        struct airo_cs_config_data *cfg_mem = priv_data;
-
-        if (cfg->flags & CISTPL_CFTABLE_DEFAULT)
-                cfg_mem->dflt = *cfg;
+        win_req_t *req = priv_data;
 
         if (cfg->index == 0)
                 return -ENODEV;
@@ -233,17 +226,17 @@ static int airo_cs_config_check(struct pcmcia_device *p_dev,
         /*  Note that the CIS values need to be rescaled */
         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;
@@ -273,14 +266,14 @@ static int airo_cs_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.Base = mem->win[0].host_addr;
-                cfg_mem->req.Size = mem->win[0].len;
-                cfg_mem->req.AccessSpeed = 0;
-                if (pcmcia_request_window(&p_dev, &cfg_mem->req, &p_dev->win) != 0)
+                req->Attributes = WIN_DATA_WIDTH_16|WIN_MEMORY_TYPE_CM;
+                req->Base = mem->win[0].host_addr;
+                req->Size = mem->win[0].len;
+                req->AccessSpeed = 0;
+                if (pcmcia_request_window(&p_dev, req, &p_dev->win) != 0)
                         return -ENODEV;
                 map.Page = 0;
                 map.CardOffset = mem->win[0].card_addr;
@@ -295,15 +288,15 @@ static int airo_cs_config_check(struct pcmcia_device *p_dev,
 static int airo_config(struct pcmcia_device *link)
 {
         local_info_t *dev;
-        struct airo_cs_config_data *cfg_mem;
+        win_req_t *req;
         int last_fn, last_ret;
 
         dev = link->priv;
 
         DEBUG(0, "airo_config(0x%p)\n", link);
 
-        cfg_mem = kzalloc(sizeof(struct airo_cs_config_data), GFP_KERNEL);
-        if (!cfg_mem)
+        req = kzalloc(sizeof(win_req_t), GFP_KERNEL);
+        if (!req)
                 return -ENOMEM;
 
         /*
@@ -320,7 +313,7 @@ static int airo_config(struct pcmcia_device *link)
          * and most client drivers will only use the CIS to fill in
          * implementation-defined details.
          */
-        last_ret = pcmcia_loop_config(link, airo_cs_config_check, cfg_mem);
+        last_ret = pcmcia_loop_config(link, airo_cs_config_check, req);
         if (last_ret)
                 goto failed;
 
@@ -365,17 +358,17 @@ static int airo_config(struct pcmcia_device *link)
                 printk(" & 0x%04x-0x%04x", link->io.BasePort2,
                        link->io.BasePort2+link->io.NumPorts2-1);
         if (link->win)
-                printk(", mem 0x%06lx-0x%06lx", cfg_mem->req.Base,
-                       cfg_mem->req.Base+cfg_mem->req.Size-1);
+                printk(", mem 0x%06lx-0x%06lx", req->Base,
+                       req->Base+req->Size-1);
         printk("\n");
-        kfree(cfg_mem);
+        kfree(req);
         return 0;
 
  cs_failed:
         cs_error(link, last_fn, last_ret);
  failed:
         airo_release(link);
-        kfree(cfg_mem);
+        kfree(req);
         return -ENODEV;
 } /* airo_config */
 
diff --git a/drivers/net/wireless/atmel_cs.c b/drivers/net/wireless/atmel_cs.c
index 12efd44d64a1..c71aae992ecc 100644
--- a/drivers/net/wireless/atmel_cs.c
+++ b/drivers/net/wireless/atmel_cs.c
@@ -226,14 +226,12 @@ static int card_present(void *arg)
 
 static int atmel_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->flags & CISTPL_CFTABLE_DEFAULT)
-                *dflt = *cfg;
         if (cfg->index == 0)
                 return -ENODEV;
+
         /* Does this card need audio output? */
         if (cfg->flags & CISTPL_CFTABLE_AUDIO) {
                 p_dev->conf.Attributes |= CONF_ENABLE_SPKR;
@@ -278,7 +276,6 @@ static int atmel_config(struct pcmcia_device *link)
         local_info_t *dev;
         int last_fn, last_ret;
         struct pcmcia_device_id *did;
-        cistpl_cftable_entry_t dflt = { 0 };
 
         dev = link->priv;
         did = handle_to_dev(link).driver_data;
@@ -297,7 +294,7 @@ static int atmel_config(struct pcmcia_device *link)
           these things without consulting the CIS, and most client drivers
           will only use the CIS to fill in implementation-defined details.
         */
-        if (pcmcia_loop_config(link, atmel_config_check, &dflt))
+        if (pcmcia_loop_config(link, atmel_config_check, NULL))
                 goto failed;
 
         /*
diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c
index 2abaa90b799d..f9595ca71a06 100644
--- a/drivers/net/wireless/hostap/hostap_cs.c
+++ b/drivers/net/wireless/hostap/hostap_cs.c
@@ -537,23 +537,21 @@ do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
  * socket and make the device available to the system */
 
 struct prism2_config_data {
-        cistpl_cftable_entry_t dflt;
         config_info_t conf;
 };
 
 static int prism2_config_check(struct pcmcia_device *p_dev,
                                cistpl_cftable_entry_t *cfg,
+                               cistpl_cftable_entry_t *dflt,
                                void *priv_data)
 {
         struct prism2_config_data *cfg_mem = priv_data;
 
-        if (cfg->flags & CISTPL_CFTABLE_DEFAULT)
-                cfg_mem->dflt = *cfg;
         if (cfg->index == 0)
                 return -ENODEV;
 
         PDEBUG(DEBUG_EXTRA, "Checking CFTABLE_ENTRY 0x%02X "
-               "(default 0x%02X)\n", cfg->index, cfg_mem->dflt.index);
+               "(default 0x%02X)\n", cfg->index, dflt->index);
 
         /* Does this card need audio output? */
         if (cfg->flags & CISTPL_CFTABLE_AUDIO) {
@@ -570,8 +568,8 @@ static int prism2_config_check(struct pcmcia_device *p_dev,
                                " this entry\n");
                         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] /
+        } else if (dflt->vcc.present & (1 << CISTPL_POWER_VNOM)) {
+                if (cfg_mem->conf.Vcc != dflt->vcc.param[CISTPL_POWER_VNOM] /
                     10000 && !ignore_cis_vcc) {
                         PDEBUG(DEBUG_EXTRA, "  Vcc (default) mismatch "
                                "- skipping this entry\n");
@@ -581,11 +579,11 @@ static int prism2_config_check(struct pcmcia_device *p_dev,
 
         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;
         else if (!(p_dev->conf.Attributes & CONF_ENABLE_IRQ)) {
                 /* At least Compaq WL200 does not have IRQInfo1 set,
@@ -597,11 +595,11 @@ static int prism2_config_check(struct pcmcia_device *p_dev,
 
         /* IO window settings */
         PDEBUG(DEBUG_EXTRA, "IO window settings: cfg->io.nwin=%d "
-               "cfg_mem->dflt.io.nwin=%d\n",
-               cfg->io.nwin, cfg_mem->dflt.io.nwin);
+               "dflt->io.nwin=%d\n",
+               cfg->io.nwin, dflt->io.nwin);
         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;
                 PDEBUG(DEBUG_EXTRA, "io->flags = 0x%04X, "
                        "io.base=0x%04x, len=%d\n", io->flags,
diff --git a/drivers/net/wireless/orinoco_cs.c b/drivers/net/wireless/orinoco_cs.c
index 67a172dfb2db..8a367f96db37 100644
--- a/drivers/net/wireless/orinoco_cs.c
+++ b/drivers/net/wireless/orinoco_cs.c
@@ -165,18 +165,16 @@ static void orinoco_cs_detach(struct pcmcia_device *link)
         } while (0)
 
 struct orinoco_cs_config_data {
-        cistpl_cftable_entry_t dflt;
         config_info_t conf;
 };
 
 static int orinoco_cs_config_check(struct pcmcia_device *p_dev,
                                    cistpl_cftable_entry_t *cfg,
+                                   cistpl_cftable_entry_t *dflt,
                                    void *priv_data)
 {
         struct orinoco_cs_config_data *cfg_mem = priv_data;
 
-        if (cfg->flags & CISTPL_CFTABLE_DEFAULT)
-                cfg_mem->dflt = *cfg;
         if (cfg->index == 0)
                 goto next_entry;
 
@@ -188,9 +186,9 @@ static int orinoco_cs_config_check(struct pcmcia_device *p_dev,
                         if (!ignore_cis_vcc)
                                 goto next_entry;
                 }
-        } 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) {
-                        DEBUG(2, "spectrum_cs_config: Vcc mismatch (cfg_mem->conf.Vcc = %d, CIS = %d)\n",  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) {
+                        DEBUG(2, "spectrum_cs_config: Vcc mismatch (cfg_mem->conf.Vcc = %d, CIS = %d)\n",  cfg_mem->conf.Vcc, dflt->vcc.param[CISTPL_POWER_VNOM] / 10000);
                         if (!ignore_cis_vcc)
                                 goto next_entry;
                 }
@@ -199,17 +197,17 @@ static int orinoco_cs_config_check(struct pcmcia_device *p_dev,
         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))
+        else if (dflt->vpp1.present & (1 << CISTPL_POWER_VNOM))
                 p_dev->conf.Vpp =
-                        cfg_mem->dflt.vpp1.param[CISTPL_POWER_VNOM] / 10000;
+                        dflt->vpp1.param[CISTPL_POWER_VNOM] / 10000;
 
         /* Do we need to allocate an interrupt? */
         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;
diff --git a/drivers/net/wireless/spectrum_cs.c b/drivers/net/wireless/spectrum_cs.c
index 7536aa91dad7..e28878dfaba3 100644
--- a/drivers/net/wireless/spectrum_cs.c
+++ b/drivers/net/wireless/spectrum_cs.c
@@ -634,18 +634,16 @@ static void spectrum_cs_detach(struct pcmcia_device *link)
  */
 
 struct spectrum_cs_config_data {
-        cistpl_cftable_entry_t dflt;
         config_info_t conf;
 };
 
 static int spectrum_cs_config_check(struct pcmcia_device *p_dev,
                                     cistpl_cftable_entry_t *cfg,
+                                    cistpl_cftable_entry_t *dflt,
                                     void *priv_data)
 {
         struct spectrum_cs_config_data *cfg_mem = priv_data;
 
-        if (cfg->flags & CISTPL_CFTABLE_DEFAULT)
-                cfg_mem->dflt = *cfg;
         if (cfg->index == 0)
                 goto next_entry;
 
@@ -657,9 +655,9 @@ static int spectrum_cs_config_check(struct pcmcia_device *p_dev,
                         if (!ignore_cis_vcc)
                                 goto next_entry;
                 }
-        } 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) {
-                        DEBUG(2, "spectrum_cs_config: Vcc mismatch (cfg_mem->conf.Vcc = %d, CIS = %d)\n",  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) {
+                        DEBUG(2, "spectrum_cs_config: Vcc mismatch (cfg_mem->conf.Vcc = %d, CIS = %d)\n",  cfg_mem->conf.Vcc, dflt->vcc.param[CISTPL_POWER_VNOM] / 10000);
                         if (!ignore_cis_vcc)
                                 goto next_entry;
                 }
@@ -668,17 +666,17 @@ static int spectrum_cs_config_check(struct pcmcia_device *p_dev,
         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))
+        else if (dflt->vpp1.present & (1 << CISTPL_POWER_VNOM))
                 p_dev->conf.Vpp =
-                        cfg_mem->dflt.vpp1.param[CISTPL_POWER_VNOM] / 10000;
+                        dflt->vpp1.param[CISTPL_POWER_VNOM] / 10000;
 
         /* Do we need to allocate an interrupt? */
         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;