]> git.karo-electronics.de Git - linux-beck.git/commitdiff
wl12xx: don't release/claim sdio on suspend/resume
authorEliad Peller <eliad@wizery.com>
Thu, 26 Jan 2012 12:12:32 +0000 (14:12 +0200)
committerLuciano Coelho <coelho@ti.com>
Wed, 15 Feb 2012 06:38:30 +0000 (08:38 +0200)
Since we reverted to claiming the host only when needed,
we no longer need to release/claim the host on suspend/resume.

Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
drivers/net/wireless/wl12xx/sdio.c

index 099c2c9c1a2db3db3bcffd9826784c47c97997ff..ce3b9a99463e1569341578db3d7ac2fa255cd547 100644 (file)
@@ -324,9 +324,6 @@ static int wl1271_suspend(struct device *dev)
                        dev_err(dev, "error while trying to keep power\n");
                        goto out;
                }
-
-               /* release host */
-               sdio_release_host(func);
        }
 out:
        return ret;
@@ -334,15 +331,7 @@ out:
 
 static int wl1271_resume(struct device *dev)
 {
-       struct sdio_func *func = dev_to_sdio_func(dev);
-       struct wl12xx_sdio_glue *glue = sdio_get_drvdata(func);
-       struct wl1271 *wl = platform_get_drvdata(glue->core);
-
        dev_dbg(dev, "wl1271 resume\n");
-       if (wl->wow_enabled) {
-               /* claim back host */
-               sdio_claim_host(func);
-       }
 
        return 0;
 }