pcmcia: remove memreq_t

Page already had to be set to 0; Offset can easily be passed as
parameter to pcmcia_map_mem_page.

CC: netdev@vger.kernel.org
CC: linux-wireless@vger.kernel.org
CC: linux-ide@vger.kernel.org
CC: linux-usb@vger.kernel.org
CC: laforge@gnumonks.org
CC: linux-mtd@lists.infradead.org
CC: linux-bluetooth@vger.kernel.org
CC: alsa-devel@alsa-project.org
CC: linux-serial@vger.kernel.org
CC: Michael Buesch <mb@bu3sch.de>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>

3 files changed, 6 insertions, 12 deletions

diff --git a/drivers/staging/comedi/drivers/ni_daq_700.c b/drivers/staging/comedi/drivers/ni_daq_700.c
index 7e41ad93703d..abaa40b8be7e 100644
--- a/drivers/staging/comedi/drivers/ni_daq_700.c
+++ b/drivers/staging/comedi/drivers/ni_daq_700.c
@@ -556,7 +556,6 @@ static int dio700_pcmcia_config_loop(struct pcmcia_device *p_dev,
                                 void *priv_data)
 {
         win_req_t *req = priv_data;
-        memreq_t map;
 
         if (cfg->index == 0)
                 return -ENODEV;
@@ -602,9 +601,8 @@ static int dio700_pcmcia_config_loop(struct pcmcia_device *p_dev,
                 req->AccessSpeed = 0;
                 if (pcmcia_request_window(p_dev, req, &p_dev->win))
                         return -ENODEV;
-                map.Page = 0;
-                map.CardOffset = mem->win[0].card_addr;
-                if (pcmcia_map_mem_page(p_dev, p_dev->win, &map))
+                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! */
diff --git a/drivers/staging/comedi/drivers/ni_daq_dio24.c b/drivers/staging/comedi/drivers/ni_daq_dio24.c
index b2483f86c242..caccece20855 100644
--- a/drivers/staging/comedi/drivers/ni_daq_dio24.c
+++ b/drivers/staging/comedi/drivers/ni_daq_dio24.c
@@ -308,7 +308,6 @@ static int dio24_pcmcia_config_loop(struct pcmcia_device *p_dev,
                                 void *priv_data)
 {
         win_req_t *req = priv_data;
-        memreq_t map;
 
         if (cfg->index == 0)
                 return -ENODEV;
@@ -354,9 +353,8 @@ static int dio24_pcmcia_config_loop(struct pcmcia_device *p_dev,
                 req->AccessSpeed = 0;
                 if (pcmcia_request_window(p_dev, req, &p_dev->win))
                         return -ENODEV;
-                map.Page = 0;
-                map.CardOffset = mem->win[0].card_addr;
-                if (pcmcia_map_mem_page(p_dev, p_dev->win, &map))
+                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! */
diff --git a/drivers/staging/comedi/drivers/ni_labpc_cs.c b/drivers/staging/comedi/drivers/ni_labpc_cs.c
index c1444b4a5b4c..94d9f7fe6f2c 100644
--- a/drivers/staging/comedi/drivers/ni_labpc_cs.c
+++ b/drivers/staging/comedi/drivers/ni_labpc_cs.c
@@ -286,7 +286,6 @@ static int labpc_pcmcia_config_loop(struct pcmcia_device *p_dev,
                                 void *priv_data)
 {
         win_req_t *req = priv_data;
-        memreq_t map;
 
         if (cfg->index == 0)
                 return -ENODEV;
@@ -332,9 +331,8 @@ static int labpc_pcmcia_config_loop(struct pcmcia_device *p_dev,
                 req->AccessSpeed = 0;
                 if (pcmcia_request_window(p_dev, req, &p_dev->win))
                         return -ENODEV;
-                map.Page = 0;
-                map.CardOffset = mem->win[0].card_addr;
-                if (pcmcia_map_mem_page(p_dev, p_dev->win, &map))
+                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! */