Messages in this thread Patch in this message | | | Date | Wed, 31 Dec 2014 14:22:40 +0300 | From | Sergei Shtylyov <> | Subject | Re: [PATCH] brcmfmac: avoid duplicated suspend/resume operation |
| |
Hello.
On 12/31/2014 11:20 AM, Fu, Zhonghui wrote:
> From e34419970a07bfcd365f9c66bdfa552188a0cd26 Mon Sep 17 00:00:00 2001 > From: Zhonghui Fu <zhonghui.fu@linux.intel.com> > Date: Mon, 29 Dec 2014 21:25:31 +0800 > Subject: [PATCH] brcmfmac: avoid duplicated suspend/resume operation
> WiFi chip has 2 SDIO functions, and PM core will trigger > twice suspend/resume operations for one WiFi chip to do > the same things. This patch avoid this case.
> Signed-off-by: Zhonghui Fu <zhonghui.fu@linux.intel.com> > --- > drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 19 +++++++++++++++++-- > 1 files changed, 17 insertions(+), 2 deletions(-)
> diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c > index 3c06e93..eee7818 100644 > --- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c > +++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c > @@ -1139,11 +1139,18 @@ void brcmf_sdio_wowl_config(struct device *dev, bool enabled) > static int brcmf_ops_sdio_suspend(struct device *dev) > { > struct brcmf_bus *bus_if = dev_get_drvdata(dev); > - struct brcmf_sdio_dev *sdiodev = bus_if->bus_priv.sdio; > + struct brcmf_sdio_dev *sdiodev; > mmc_pm_flag_t sdio_flags; > + struct sdio_func *func = dev_to_sdio_func(dev); > > brcmf_dbg(SDIO, "Enter\n"); > > + if (func->num == 2) { > + return 0; > + }
{} not needed.
[...] > @@ -1164,9 +1171,17 @@ static int brcmf_ops_sdio_suspend(struct device *dev) > static int brcmf_ops_sdio_resume(struct device *dev) > { > struct brcmf_bus *bus_if = dev_get_drvdata(dev); > - struct brcmf_sdio_dev *sdiodev = bus_if->bus_priv.sdio; > + struct brcmf_sdio_dev *sdiodev; > + struct sdio_func *func = dev_to_sdio_func(dev); > > brcmf_dbg(SDIO, "Enter\n"); > + > + if (func->num == 2) { > + return 0; > + }
Same here.
[...]
WBR, Sergei
| |