From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kalle Valo Subject: Re: [PATCH] rsi: sdio: fix building without CONFIG_PM Date: Thu, 02 Nov 2017 17:24:08 +0200 Message-ID: <87inesln53.fsf@codeaurora.org> References: <20171102142827.773188-1-arnd@arndb.de> <87r2tglod5.fsf@codeaurora.org> Mime-Version: 1.0 Content-Type: text/plain Cc: Prameela Rani Garnepudi , Amitkumar Karwar , Karun Eagalapati , linux-wireless , Networking , Linux Kernel Mailing List To: Arnd Bergmann Return-path: In-Reply-To: (Arnd Bergmann's message of "Thu, 2 Nov 2017 16:10:24 +0100") Sender: linux-kernel-owner@vger.kernel.org List-Id: netdev.vger.kernel.org Arnd Bergmann writes: > On Thu, Nov 2, 2017 at 3:57 PM, Kalle Valo wrote: >> Arnd Bergmann writes: >> >>> The addition of the WoWLAN support has caused a number of new >>> build errors when CONFIG_PM is disabled, including: >>> >>> drivers/net/wireless/rsi/rsi_91x_mac80211.c: In function 'rsi_wow_map_triggers': >>> drivers/net/wireless/rsi/rsi_91x_mac80211.c:1773:19: error: >>> 'RSI_WOW_ANY' undeclared (first use in this function); did you mean >>> 'RSI_WEP_KEY'? >>> drivers/net/wireless/rsi/rsi_91x_mac80211.c: In function 'rsi_mac80211_attach': >>> drivers/net/wireless/rsi/rsi_91x_mac80211.c:1980:7: error: 'struct >>> wiphy' has no member named 'wowlan' >>> >>> This adds more #ifdef CONFIG_PM guards around the code that otherwise >>> fails to build and that we know is not used without CONFIG_PM. >>> >>> Fixes: f3ac4e7394a1 ("rsi: sdio: add WOWLAN support for S3 suspend state") >>> Signed-off-by: Arnd Bergmann >> >> Amit already submitted two patches to fix this problem: >> >> https://patchwork.kernel.org/patch/10036297/ >> >> https://patchwork.kernel.org/patch/10036299/ >> >> I applied them to my pending branch yesterday, and at least buildbot >> seems to be happy, so I'm planning take apply those instead. Please let >> me know if that's a problem. > > Looks good: the first patch is identical to mine, the second one appears to > be something I missed. Good, thanks for checking. -- Kalle Valo