Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2cc78ff7 authored by Ohad Ben-Cohen's avatar Ohad Ben-Cohen Committed by John W. Linville
Browse files

wl1271: propagate set_power's return value 



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: default avatarOhad Ben-Cohen <ohad@wizery.com>
Acked-by: default avatarLuciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent c1f9a095

drivers/net/wireless/wl12xx/wl1271.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/net/wireless/wl12xx/wl1271_io.h

+6 −3
Original line number Diff line number Diff line
@@ -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);

	int ret = wl->if_ops->power(wl, true);

	if (ret == 0)

		set_bit(WL1271_FLAG_GPIO_POWER, &wl->flags);



	return ret;

}

drivers/net/wireless/wl12xx/wl1271_main.c

+3 −1
Original line number Diff line number Diff line
@@ -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);

drivers/net/wireless/wl12xx/wl1271_sdio.c

+9 −6
Original line number Diff line number Diff line
@@ -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 = {

drivers/net/wireless/wl12xx/wl1271_spi.c

+3 −1
Original line number Diff line number Diff line
@@ -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 = {