2011-06-26 15:00:52

by Ohad Ben Cohen

Subject: [PATCH] wl12xx: one SDIO initialization is enough

Skip manual device power on in case runtime PM is enabled for
our device.

This eliminates a secondary & redundant SDIO init sequence.

Signed-off-by: Ohad Ben-Cohen <[email protected]>
---
This patch depends on "wl12xx: don't bail if mmc isn't MMC_CAP_POWER_OFF_CARD"

https://patchwork.kernel.org/patch/827772/

drivers/net/wireless/wl12xx/sdio.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/net/wireless/wl12xx/sdio.c b/drivers/net/wireless/wl12xx/sdio.c
index 989b077..886c35f 100644
--- a/drivers/net/wireless/wl12xx/sdio.c
+++ b/drivers/net/wireless/wl12xx/sdio.c
@@ -174,13 +174,13 @@ static int wl1271_sdio_power_on(struct wl1271 *wl)
ret = pm_runtime_get_sync(&func->dev);
if (ret)
goto out;
+ } else {
+ /* Runtime PM is disabled: power up the card manually */
+ ret = mmc_power_restore_host(func->card->host);
+ if (ret < 0)
+ goto out;
}

- /* Runtime PM might be disabled, so power up the card manually */
- ret = mmc_power_restore_host(func->card->host);
- if (ret < 0)
- goto out;
-
sdio_claim_host(func);
sdio_enable_func(func);

@@ -196,7 +196,7 @@ static int wl1271_sdio_power_off(struct wl1271 *wl)
sdio_disable_func(func);
sdio_release_host(func);

- /* Runtime PM might be disabled, so power off the card manually */
+ /* Power off the card manually, even if runtime PM is enabled. */
ret = mmc_power_save_host(func->card->host);
if (ret < 0)
return ret;
--
1.7.1

2011-07-05 19:07:07

by Luciano Coelho

Subject: Re: [PATCH] wl12xx: one SDIO initialization is enough

On Sun, 2011-06-26 at 18:00 +0300, Ohad Ben-Cohen wrote:
> Skip manual device power on in case runtime PM is enabled for
> our device.
>
> This eliminates a secondary & redundant SDIO init sequence.
>
> Signed-off-by: Ohad Ben-Cohen <[email protected]>
> ---
> This patch depends on "wl12xx: don't bail if mmc isn't MMC_CAP_POWER_OFF_CARD"
>
> https://patchwork.kernel.org/patch/827772/

Thanks, Ohad, applied!

--
Cheers,
Luca.