korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-13 05:54:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

wl1271: propagate set_power's return value

Browse Source 
Make it possible for the set power method to indicate a
success/failure return value. This is needed to support
more complex power on/off operations such as SDIO
power manipulations.

Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com>
Acked-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Ohad Ben-Cohen 2010-09-16 01:22:04 +02:00 committed by John W. Linville
parent c1f9a09560
commit 2cc78ff78c
5 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/wl12xx/wl1271.h
View File

@ -313,7 +313,7 @@ struct wl1271_if_operations {
bool fixed);
void (*reset)(struct wl1271 *wl);
void (*init)(struct wl1271 *wl);
void (*power)(struct wl1271 *wl, bool enable);
int (*power)(struct wl1271 *wl, bool enable);
struct device* (*dev)(struct wl1271 *wl);
void (*enable_irq)(struct wl1271 *wl);
void (*disable_irq)(struct wl1271 *wl);

9
drivers/net/wireless/wl12xx/wl1271_io.h
View File

@ -144,10 +144,13 @@ static inline void wl1271_power_off(struct wl1271 *wl)
clear_bit(WL1271_FLAG_GPIO_POWER, &wl->flags);
}
static inline void wl1271_power_on(struct wl1271 *wl)
static inline int wl1271_power_on(struct wl1271 *wl)
{
wl->if_ops->power(wl, true);
set_bit(WL1271_FLAG_GPIO_POWER, &wl->flags);
int ret = wl->if_ops->power(wl, true);
if (ret == 0)
set_bit(WL1271_FLAG_GPIO_POWER, &wl->flags);
return ret;
}

4
drivers/net/wireless/wl12xx/wl1271_main.c
View File

@ -621,7 +621,9 @@ static int wl1271_chip_wakeup(struct wl1271 *wl)
int ret = 0;
msleep(WL1271_PRE_POWER_ON_SLEEP);
wl1271_power_on(wl);
ret = wl1271_power_on(wl);
if (ret < 0)
goto out;
msleep(WL1271_POWER_ON_SLEEP);
wl1271_io_reset(wl);
wl1271_io_init(wl);

15
drivers/net/wireless/wl12xx/wl1271_sdio.c
View File

@ -159,35 +159,38 @@ static void wl1271_sdio_raw_write(struct wl1271 *wl, int addr, void *buf,
wl1271_error("sdio write failed (%d)", ret);
}
static void wl1271_sdio_power_on(struct wl1271 *wl)
static int wl1271_sdio_power_on(struct wl1271 *wl)
{
struct sdio_func *func = wl_to_func(wl);
sdio_claim_host(func);
sdio_enable_func(func);
sdio_release_host(func);
return 0;
}
static void wl1271_sdio_power_off(struct wl1271 *wl)
static int wl1271_sdio_power_off(struct wl1271 *wl)
{
struct sdio_func *func = wl_to_func(wl);
sdio_claim_host(func);
sdio_disable_func(func);
sdio_release_host(func);
return 0;
}
static void wl1271_sdio_set_power(struct wl1271 *wl, bool enable)
static int wl1271_sdio_set_power(struct wl1271 *wl, bool enable)
{
/* Let the SDIO stack handle wlan_enable control, so we
* keep host claimed while wlan is in use to keep wl1271
* alive.
*/
if (enable)
wl1271_sdio_power_on(wl);
return wl1271_sdio_power_on(wl);
else
wl1271_sdio_power_off(wl);
return wl1271_sdio_power_off(wl);
}
static struct wl1271_if_operations sdio_ops = {

4
drivers/net/wireless/wl12xx/wl1271_spi.c
View File

@ -312,10 +312,12 @@ static irqreturn_t wl1271_irq(int irq, void *cookie)
return IRQ_HANDLED;
}
static void wl1271_spi_set_power(struct wl1271 *wl, bool enable)
static int wl1271_spi_set_power(struct wl1271 *wl, bool enable)
{
if (wl->set_power)
wl->set_power(enable);
return 0;
}
static struct wl1271_if_operations spi_ops = {