summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/wl12xx/wl1271_sdio.c
diff options
context:
space:
mode:
authorTeemu Paasikivi <ext-teemu.3.paasikivi@nokia.com>2010-03-18 13:26:27 +0300
committerJohn W. Linville <linville@tuxdriver.com>2010-03-23 23:50:18 +0300
commitbecd551cac0d6868819083c59fc32d1072ba1804 (patch)
treef99edc958ed4ca4553d6c3d7fb8d80ea7f572398 /drivers/net/wireless/wl12xx/wl1271_sdio.c
parentb43316dbf9c6b01f3ac6dc23bcb94ae66eb3a721 (diff)
downloadlinux-becd551cac0d6868819083c59fc32d1072ba1804.tar.xz
wl1271: Cleaned up wlan power on/off functions
Added method for wlan power control to io_ops struct and moved wl1271_power_on and wl1271_power_off functions to wl1271_io.h. Signed-off-by: Teemu Paasikivi <ext-teemu.3.paasikivi@nokia.com> Reviewed-by: Juuso Oikarinen <juuso.oikarinen@nokia.com> Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com> Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/wl12xx/wl1271_sdio.c')
-rw-r--r--drivers/net/wireless/wl12xx/wl1271_sdio.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_sdio.c b/drivers/net/wireless/wl12xx/wl1271_sdio.c
index 1f204db30c27..d43e0d41d439 100644
--- a/drivers/net/wireless/wl12xx/wl1271_sdio.c
+++ b/drivers/net/wireless/wl12xx/wl1271_sdio.c
@@ -156,20 +156,21 @@ static void wl1271_sdio_raw_write(struct wl1271 *wl, int addr, void *buf,
sdio_release_host(func);
}
+static void wl1271_sdio_set_power(struct wl1271 *wl, bool enable)
+{
+}
+
static struct wl1271_if_operations sdio_ops = {
.read = wl1271_sdio_raw_read,
.write = wl1271_sdio_raw_write,
.reset = wl1271_sdio_reset,
.init = wl1271_sdio_init,
+ .power = wl1271_sdio_set_power,
.dev = wl1271_sdio_wl_to_dev,
.enable_irq = wl1271_sdio_enable_interrupts,
.disable_irq = wl1271_sdio_disable_interrupts
};
-static void wl1271_sdio_set_power(bool enable)
-{
-}
-
static int __devinit wl1271_probe(struct sdio_func *func,
const struct sdio_device_id *id)
{
@@ -190,8 +191,6 @@ static int __devinit wl1271_probe(struct sdio_func *func,
wl->if_priv = func;
wl->if_ops = &sdio_ops;
- wl->set_power = wl1271_sdio_set_power;
-
/* Grab access to FN0 for ELP reg. */
func->card->quirks |= MMC_QUIRK_LENIENT_FN0;