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, 2 insertions, 12 deletions

diff --git a/drivers/char/pcmcia/ipwireless/main.c b/drivers/char/pcmcia/ipwireless/main.c
index 5f87b9f7b6d2..6c4aa4b0be99 100644
--- a/drivers/char/pcmcia/ipwireless/main.c
+++ b/drivers/char/pcmcia/ipwireless/main.c
@@ -84,8 +84,6 @@ static int ipwireless_probe(struct pcmcia_device *p_dev,
 {
         struct ipw_dev *ipw = priv_data;
         struct resource *io_resource;
-        memreq_t memreq_attr_memory;
-        memreq_t memreq_common_memory;
         int ret;
 
         p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
@@ -121,11 +119,8 @@ static int ipwireless_probe(struct pcmcia_device *p_dev,
         if (ret != 0)
                 goto exit1;
 
-        memreq_common_memory.CardOffset = cfg->mem.win[0].card_addr;
-        memreq_common_memory.Page = 0;
-
         ret = pcmcia_map_mem_page(p_dev, ipw->handle_common_memory,
-                                &memreq_common_memory);
+                                cfg->mem.win[0].card_addr);
 
         if (ret != 0)
                 goto exit2;
@@ -150,12 +145,7 @@ static int ipwireless_probe(struct pcmcia_device *p_dev,
         if (ret != 0)
                 goto exit2;
 
-        memreq_attr_memory.CardOffset = 0;
-        memreq_attr_memory.Page = 0;
-
-        ret = pcmcia_map_mem_page(p_dev, ipw->handle_attr_memory,
-                                &memreq_attr_memory);
-
+        ret = pcmcia_map_mem_page(p_dev, ipw->handle_attr_memory, 0);
         if (ret != 0)
                 goto exit3;