pcmcia: do not request windows if you don't need to

Several drivers contained dummy code to request for memory windows,
even though they never made use of it. Remove all such code
snippets.

CC: netdev@vger.kernel.org
CC: linux-wireless@vger.kernel.org
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>

3 files changed, 3 insertions, 68 deletions

diff --git a/drivers/staging/comedi/drivers/ni_daq_700.c b/drivers/staging/comedi/drivers/ni_daq_700.c
index abaa40b8be7..bf2e84aa03e 100644
--- a/drivers/staging/comedi/drivers/ni_daq_700.c
+++ b/drivers/staging/comedi/drivers/ni_daq_700.c
@@ -555,8 +555,6 @@ static int dio700_pcmcia_config_loop(struct pcmcia_device *p_dev,
                                 unsigned int vcc,
                                 void *priv_data)
 {
-        win_req_t *req = priv_data;
-
         if (cfg->index == 0)
                 return -ENODEV;
 
@@ -589,22 +587,6 @@ static int dio700_pcmcia_config_loop(struct pcmcia_device *p_dev,
                         return -ENODEV;
         }
 
-        if ((cfg->mem.nwin > 0) || (dflt->mem.nwin > 0)) {
-                cistpl_mem_t *mem =
-                        (cfg->mem.nwin) ? &cfg->mem : &dflt->mem;
-                req->Attributes = WIN_DATA_WIDTH_16 | WIN_MEMORY_TYPE_CM;
-                req->Attributes |= WIN_ENABLE;
-                req->Base = mem->win[0].host_addr;
-                req->Size = mem->win[0].len;
-                if (req->Size < 0x1000)
-                        req->Size = 0x1000;
-                req->AccessSpeed = 0;
-                if (pcmcia_request_window(p_dev, req, &p_dev->win))
-                        return -ENODEV;
-                if (pcmcia_map_mem_page(p_dev, p_dev->win,
-                                mem->win[0].card_addr))
-                        return -ENODEV;
-        }
         /* If we got this far, we're cool! */
         return 0;
 }
@@ -618,7 +600,7 @@ static void dio700_config(struct pcmcia_device *link)
 
         dev_dbg(&link->dev, "dio700_config\n");
 
-        ret = pcmcia_loop_config(link, dio700_pcmcia_config_loop, &req);
+        ret = pcmcia_loop_config(link, dio700_pcmcia_config_loop, NULL);
         if (ret) {
                 dev_warn(&link->dev, "no configuration found\n");
                 goto failed;
@@ -644,9 +626,6 @@ static void dio700_config(struct pcmcia_device *link)
                 printk(", io %pR", link->resource[0]);
         if (link->resource[1])
                 printk(" & %pR", link->resource[1]);
-        if (link->win)
-                printk(", mem 0x%06lx-0x%06lx", req.Base,
-                       req.Base + req.Size - 1);
         printk("\n");
 
         return;
diff --git a/drivers/staging/comedi/drivers/ni_daq_dio24.c b/drivers/staging/comedi/drivers/ni_daq_dio24.c
index caccece2085..9112e70cc85 100644
--- a/drivers/staging/comedi/drivers/ni_daq_dio24.c
+++ b/drivers/staging/comedi/drivers/ni_daq_dio24.c
@@ -307,8 +307,6 @@ static int dio24_pcmcia_config_loop(struct pcmcia_device *p_dev,
                                 unsigned int vcc,
                                 void *priv_data)
 {
-        win_req_t *req = priv_data;
-
         if (cfg->index == 0)
                 return -ENODEV;
 
@@ -341,22 +339,6 @@ static int dio24_pcmcia_config_loop(struct pcmcia_device *p_dev,
                         return -ENODEV;
         }
 
-        if ((cfg->mem.nwin > 0) || (dflt->mem.nwin > 0)) {
-                cistpl_mem_t *mem =
-                        (cfg->mem.nwin) ? &cfg->mem : &dflt->mem;
-                req->Attributes = WIN_DATA_WIDTH_16 | WIN_MEMORY_TYPE_CM;
-                req->Attributes |= WIN_ENABLE;
-                req->Base = mem->win[0].host_addr;
-                req->Size = mem->win[0].len;
-                if (req->Size < 0x1000)
-                        req->Size = 0x1000;
-                req->AccessSpeed = 0;
-                if (pcmcia_request_window(p_dev, req, &p_dev->win))
-                        return -ENODEV;
-                if (pcmcia_map_mem_page(p_dev, p_dev->win,
-                                                mem->win[0].card_addr))
-                        return -ENODEV;
-        }
         /* If we got this far, we're cool! */
         return 0;
 }
@@ -364,13 +346,12 @@ static int dio24_pcmcia_config_loop(struct pcmcia_device *p_dev,
 static void dio24_config(struct pcmcia_device *link)
 {
         int ret;
-        win_req_t req;
 
         printk(KERN_INFO "ni_daq_dio24: HOLA SOY YO! - config\n");
 
         dev_dbg(&link->dev, "dio24_config\n");
 
-        ret = pcmcia_loop_config(link, dio24_pcmcia_config_loop, &req);
+        ret = pcmcia_loop_config(link, dio24_pcmcia_config_loop, NULL);
         if (ret) {
                 dev_warn(&link->dev, "no configuration found\n");
                 goto failed;
@@ -396,9 +377,6 @@ static void dio24_config(struct pcmcia_device *link)
                 printk(" & %pR", link->resource[0]);
         if (link->resource[1])
                 printk(" & %pR", link->resource[1]);
-        if (link->win)
-                printk(", mem 0x%06lx-0x%06lx", req.Base,
-                       req.Base + req.Size - 1);
         printk("\n");
 
         return;
diff --git a/drivers/staging/comedi/drivers/ni_labpc_cs.c b/drivers/staging/comedi/drivers/ni_labpc_cs.c
index 94d9f7fe6f2..f204961e078 100644
--- a/drivers/staging/comedi/drivers/ni_labpc_cs.c
+++ b/drivers/staging/comedi/drivers/ni_labpc_cs.c
@@ -285,8 +285,6 @@ static int labpc_pcmcia_config_loop(struct pcmcia_device *p_dev,
                                 unsigned int vcc,
                                 void *priv_data)
 {
-        win_req_t *req = priv_data;
-
         if (cfg->index == 0)
                 return -ENODEV;
 
@@ -319,22 +317,6 @@ static int labpc_pcmcia_config_loop(struct pcmcia_device *p_dev,
                         return -ENODEV;
         }
 
-        if ((cfg->mem.nwin > 0) || (dflt->mem.nwin > 0)) {
-                cistpl_mem_t *mem =
-                        (cfg->mem.nwin) ? &cfg->mem : &dflt->mem;
-                req->Attributes = WIN_DATA_WIDTH_16 | WIN_MEMORY_TYPE_CM;
-                req->Attributes |= WIN_ENABLE;
-                req->Base = mem->win[0].host_addr;
-                req->Size = mem->win[0].len;
-                if (req->Size < 0x1000)
-                        req->Size = 0x1000;
-                req->AccessSpeed = 0;
-                if (pcmcia_request_window(p_dev, req, &p_dev->win))
-                        return -ENODEV;
-                if (pcmcia_map_mem_page(p_dev, p_dev->win,
-                                                mem->win[0].card_addr))
-                        return -ENODEV;
-        }
         /* If we got this far, we're cool! */
         return 0;
 }
@@ -343,11 +325,10 @@ static int labpc_pcmcia_config_loop(struct pcmcia_device *p_dev,
 static void labpc_config(struct pcmcia_device *link)
 {
         int ret;
-        win_req_t req;
 
         dev_dbg(&link->dev, "labpc_config\n");
 
-        ret = pcmcia_loop_config(link, labpc_pcmcia_config_loop, &req);
+        ret = pcmcia_loop_config(link, labpc_pcmcia_config_loop, NULL);
         if (ret) {
                 dev_warn(&link->dev, "no configuration found\n");
                 goto failed;
@@ -373,9 +354,6 @@ static void labpc_config(struct pcmcia_device *link)
                 printk(" & %pR", link->resource[0]);
         if (link->resource[1])
                 printk(" & %pR", link->resource[1]);
-        if (link->win)
-                printk(", mem 0x%06lx-0x%06lx", req.Base,
-                       req.Base + req.Size - 1);
         printk("\n");
 
         return;