pcmcia: pcmcia_config_loop() improvement by passing vcc

By passing the current Vcc setting to the pcmcia_config_loop callback
function, we can remove pcmcia_get_configuration_info() calls from many
drivers.

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

1 files changed, 4 insertions, 8 deletions

diff --git a/drivers/ide/legacy/ide-cs.c b/drivers/ide/legacy/ide-cs.c
index cc8eeaf80275..6472cd8231f7 100644
--- a/drivers/ide/legacy/ide-cs.c
+++ b/drivers/ide/legacy/ide-cs.c
@@ -221,7 +221,6 @@ out_release:
 do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
 
 struct pcmcia_config_check {
-        config_info_t conf;
         unsigned long ctl_base;
         int skip_vcc;
         int is_kme;
@@ -230,6 +229,7 @@ struct pcmcia_config_check {
 static int pcmcia_check_one_config(struct pcmcia_device *pdev,
                                    cistpl_cftable_entry_t *cfg,
                                    cistpl_cftable_entry_t *dflt,
+                                   unsigned int vcc,
                                    void *priv_data)
 {
         struct pcmcia_config_check *stk = priv_data;
@@ -237,12 +237,10 @@ static int pcmcia_check_one_config(struct pcmcia_device *pdev,
         /* Check for matching Vcc, unless we're desperate */
         if (!stk->skip_vcc) {
                 if (cfg->vcc.present & (1 << CISTPL_POWER_VNOM)) {
-                        if (stk->conf.Vcc !=
-                            cfg->vcc.param[CISTPL_POWER_VNOM] / 10000)
+                        if (vcc != cfg->vcc.param[CISTPL_POWER_VNOM] / 10000)
                                 return -ENODEV;
                 } else if (dflt->vcc.present & (1 << CISTPL_POWER_VNOM)) {
-                        if (stk->conf.Vcc !=
-                            dflt->vcc.param[CISTPL_POWER_VNOM] / 10000)
+                        if (vcc != dflt->vcc.param[CISTPL_POWER_VNOM] / 10000)
                                 return -ENODEV;
                 }
         }
@@ -298,10 +296,8 @@ static int ide_config(struct pcmcia_device *link)
     if (!stk)
             goto err_mem;
     stk->is_kme = is_kme;
-
-    /* Not sure if this is right... look up the current Vcc */
-    CS_CHECK(GetConfigurationInfo, pcmcia_get_configuration_info(link, &stk->conf));
     stk->skip_vcc = io_base = ctl_base = 0;
+
     if (pcmcia_loop_config(link, pcmcia_check_one_config, stk)) {
             stk->skip_vcc = 1;
             if (pcmcia_loop_config(link, pcmcia_check_one_config, stk))