pcmcia: remove deprecated handle_to_dev() macro

[firefly-linux-kernel-4.4.55.git] / drivers / net / wireless / ray_cs.c

diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c
index 28db7914a5d1671fd138277490a8052dda6d4d03..5e0f4c3eac383aff23882bcb0514ce4e2431c316 100644 (file)
--- a/drivers/net/wireless/ray_cs.c
+++ b/drivers/net/wireless/ray_cs.c
@@ -438,12 +438,12 @@ static int ray_config(struct pcmcia_device *link)
        req.Base = 0;
        req.Size = 0x8000;
        req.AccessSpeed = ray_mem_speed;
-       ret = pcmcia_request_window(&link, &req, &link->win);
+       ret = pcmcia_request_window(link, &req, &link->win);
        if (ret)
                goto failed;
        mem.CardOffset = 0x0000;
        mem.Page = 0;
-       ret = pcmcia_map_mem_page(link->win, &mem);
+       ret = pcmcia_map_mem_page(link, link->win, &mem);
        if (ret)
                goto failed;
        local->sram = ioremap(req.Base, req.Size);
@@ -454,12 +454,12 @@ static int ray_config(struct pcmcia_device *link)
        req.Base = 0;
        req.Size = 0x4000;
        req.AccessSpeed = ray_mem_speed;
-       ret = pcmcia_request_window(&link, &req, &local->rmem_handle);
+       ret = pcmcia_request_window(link, &req, &local->rmem_handle);
        if (ret)
                goto failed;
        mem.CardOffset = 0x8000;
        mem.Page = 0;
-       ret = pcmcia_map_mem_page(local->rmem_handle, &mem);
+       ret = pcmcia_map_mem_page(link, local->rmem_handle, &mem);
        if (ret)
                goto failed;
        local->rmem = ioremap(req.Base, req.Size);
@@ -470,12 +470,12 @@ static int ray_config(struct pcmcia_device *link)
        req.Base = 0;
        req.Size = 0x1000;
        req.AccessSpeed = ray_mem_speed;
-       ret = pcmcia_request_window(&link, &req, &local->amem_handle);
+       ret = pcmcia_request_window(link, &req, &local->amem_handle);
        if (ret)
                goto failed;
        mem.CardOffset = 0x0000;
        mem.Page = 0;
-       ret = pcmcia_map_mem_page(local->amem_handle, &mem);
+       ret = pcmcia_map_mem_page(link, local->amem_handle, &mem);
        if (ret)
                goto failed;
        local->amem = ioremap(req.Base, req.Size);
@@ -488,7 +488,7 @@ static int ray_config(struct pcmcia_device *link)
                return -ENODEV;
        }
 
-       SET_NETDEV_DEV(dev, &handle_to_dev(link));
+       SET_NETDEV_DEV(dev, &link->dev);
        i = register_netdev(dev);
        if (i != 0) {
                printk("ray_config register_netdev() failed\n");
@@ -820,10 +820,10 @@ static void ray_release(struct pcmcia_device *link)
        iounmap(local->rmem);
        iounmap(local->amem);
        /* Do bother checking to see if these succeed or not */
-       i = pcmcia_release_window(local->amem_handle);
+       i = pcmcia_release_window(link, local->amem_handle);
        if (i != 0)
                dev_dbg(&link->dev, "ReleaseWindow(local->amem) ret = %x\n", i);
-       i = pcmcia_release_window(local->rmem_handle);
+       i = pcmcia_release_window(link, local->rmem_handle);
        if (i != 0)
                dev_dbg(&link->dev, "ReleaseWindow(local->rmem) ret = %x\n", i);
        pcmcia_disable_device(link);