pcmcia: do not use win_req_t when calling pcmcia_request_window()

[mirror_ubuntu-bionic-kernel.git] / drivers / net / wireless / b43 / pcmcia.c

diff --git a/drivers/net/wireless/b43/pcmcia.c b/drivers/net/wireless/b43/pcmcia.c
index dfbc41d431ffae744fca15a2a90506ee5e6abb01..618d9b5c1054f225c30a23d9a963e0a51a556b3d 100644 (file)
--- 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;