pcmcia: do not use win_req_t when calling pcmcia_request_window()

Instead of win_req_t, drivers are now requested to fill out
struct pcmcia_device *p_dev->resource[2,3,4,5] for up to four iomem
ranges. After a call to pcmcia_request_window(), the windows found there
are reserved and may be used until pcmcia_release_window() is called.

CC: netdev@vger.kernel.org
CC: linux-wireless@vger.kernel.org
CC: linux-mtd@lists.infradead.org
CC: Jiri Kosina <jkosina@suse.cz>
CC: linux-scsi@vger.kernel.org
Tested-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>

1 files changed, 6 insertions, 8 deletions

diff --git a/drivers/net/wireless/b43/pcmcia.c b/drivers/net/wireless/b43/pcmcia.c
index dfbc41d431f..618d9b5c105 100644
--- a/drivers/net/wireless/b43/pcmcia.c
+++ b/drivers/net/wireless/b43/pcmcia.c
@@ -63,7 +63,6 @@ static int b43_pcmcia_resume(struct pcmcia_device *dev)
 static int __devinit b43_pcmcia_probe(struct pcmcia_device *dev)
 {
         struct ssb_bus *ssb;
-        win_req_t win;
         int err = -ENOMEM;
         int res = 0;
 
@@ -76,16 +75,15 @@ static int __devinit b43_pcmcia_probe(struct pcmcia_device *dev)
         dev->conf.Attributes = CONF_ENABLE_IRQ;
         dev->conf.IntType = INT_MEMORY_AND_IO;
 
-        win.Attributes =  WIN_ENABLE | WIN_DATA_WIDTH_16 |
+        dev->resource[2]->flags |=  WIN_ENABLE | WIN_DATA_WIDTH_16 |
                          WIN_USE_WAIT;
-        win.Base = 0;
-        win.Size = SSB_CORE_SIZE;
-        win.AccessSpeed = 250;
-        res = pcmcia_request_window(dev, &win, &dev->win);
+        dev->resource[2]->start = 0;
+        dev->resource[2]->end = SSB_CORE_SIZE;
+        res = pcmcia_request_window(dev, dev->resource[2], 250);
         if (res != 0)
                 goto err_kfree_ssb;
 
-        res = pcmcia_map_mem_page(dev, dev->win, 0);
+        res = pcmcia_map_mem_page(dev, dev->resource[2], 0);
         if (res != 0)
                 goto err_disable;
 
@@ -96,7 +94,7 @@ static int __devinit b43_pcmcia_probe(struct pcmcia_device *dev)
         if (res != 0)
                 goto err_disable;
 
-        err = ssb_bus_pcmciabus_register(ssb, dev, win.Base);
+        err = ssb_bus_pcmciabus_register(ssb, dev, dev->resource[2]->start);
         if (err)
                 goto err_disable;
         dev->priv = ssb;