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>

1 files changed, 6 insertions, 7 deletions

diff --git a/drivers/mtd/maps/pcmciamtd.c b/drivers/mtd/maps/pcmciamtd.c
index 79488164e43..f97463ecfc5 100644
--- a/drivers/mtd/maps/pcmciamtd.c
+++ b/drivers/mtd/maps/pcmciamtd.c
@@ -102,7 +102,7 @@ static caddr_t remap_window(struct map_info *map, unsigned long to)
 {
         struct pcmciamtd_dev *dev = (struct pcmciamtd_dev *)map->map_priv_1;
         window_handle_t win = (window_handle_t)map->map_priv_2;
-        memreq_t mrq;
+        unsigned int offset;
         int ret;
 
         if (!pcmcia_dev_present(dev->p_dev)) {
@@ -110,15 +110,14 @@ static caddr_t remap_window(struct map_info *map, unsigned long to)
                 return 0;
         }
 
-        mrq.CardOffset = to & ~(dev->win_size-1);
-        if(mrq.CardOffset != dev->offset) {
+        offset = to & ~(dev->win_size-1);
+        if (offset != dev->offset) {
                 DEBUG(2, "Remapping window from 0x%8.8x to 0x%8.8x",
-                      dev->offset, mrq.CardOffset);
-                mrq.Page = 0;
-                ret = pcmcia_map_mem_page(dev->p_dev, win, &mrq);
+                      dev->offset, offset);
+                ret = pcmcia_map_mem_page(dev->p_dev, win, offset);
                 if (ret != 0)
                         return NULL;
-                dev->offset = mrq.CardOffset;
+                dev->offset = offset;
         }
         return dev->win_base + (to & (dev->win_size-1));
 }