* [PATCH] staging: wilc1000: fix compilation without CONFIG_PM
@ 2016-02-05 15:21 Arnd Bergmann
2016-02-07 6:03 ` Greg Kroah-Hartman
0 siblings, 1 reply; 2+ messages in thread
From: Arnd Bergmann @ 2016-02-05 15:21 UTC (permalink / raw
To: linux-arm-kernel
After the addition of the wakeup code in wilc1000, it no longer
builds when CONFIG_PM is disabled:
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c: In function 'wilc_create_wiphy':
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c:2632:13: error: 'struct wiphy' has no member named 'wowlan'
wdev->wiphy->wowlan = &wowlan_support;
This marks the wowlan_support variable as __maybe_unused and hides
the reference when CONFIG_PM is disabled to avoid the build error.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: 73584a40d748 ("staging: wilc1000: add ops resuem/suspend/wakeup in cfg80211")
---
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 4eede2b4e661..7e6262026070 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -74,7 +74,7 @@ static const struct ieee80211_txrx_stypes
}
};
-static const struct wiphy_wowlan_support wowlan_support = {
+static const struct wiphy_wowlan_support wowlan_support __maybe_unused = {
.flags = WIPHY_WOWLAN_ANY
};
@@ -2629,7 +2629,9 @@ struct wireless_dev *wilc_create_wiphy(struct net_device *net, struct device *de
sema_init(&(priv->SemHandleUpdateStats), 1);
priv->wdev = wdev;
wdev->wiphy->max_scan_ssids = MAX_NUM_PROBED_SSID;
+#ifdef CONFIG_PM
wdev->wiphy->wowlan = &wowlan_support;
+#endif
wdev->wiphy->max_num_pmkids = WILC_MAX_NUM_PMKIDS;
PRINT_INFO(CFG80211_DBG, "Max number of PMKIDs = %d\n", wdev->wiphy->max_num_pmkids);
--
2.7.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH] staging: wilc1000: fix compilation without CONFIG_PM
2016-02-05 15:21 [PATCH] staging: wilc1000: fix compilation without CONFIG_PM Arnd Bergmann
@ 2016-02-07 6:03 ` Greg Kroah-Hartman
0 siblings, 0 replies; 2+ messages in thread
From: Greg Kroah-Hartman @ 2016-02-07 6:03 UTC (permalink / raw
To: linux-arm-kernel
On Fri, Feb 05, 2016 at 04:21:50PM +0100, Arnd Bergmann wrote:
> After the addition of the wakeup code in wilc1000, it no longer
> builds when CONFIG_PM is disabled:
>
> drivers/staging/wilc1000/wilc_wfi_cfgoperations.c: In function 'wilc_create_wiphy':
> drivers/staging/wilc1000/wilc_wfi_cfgoperations.c:2632:13: error: 'struct wiphy' has no member named 'wowlan'
> wdev->wiphy->wowlan = &wowlan_support;
>
> This marks the wowlan_support variable as __maybe_unused and hides
> the reference when CONFIG_PM is disabled to avoid the build error.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Fixes: 73584a40d748 ("staging: wilc1000: add ops resuem/suspend/wakeup in cfg80211")
> ---
> drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
A different patch was sent just before yours. Actually 2 different
ones...
thanks,
greg k-h
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-02-07 6:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-05 15:21 [PATCH] staging: wilc1000: fix compilation without CONFIG_PM Arnd Bergmann
2016-02-07 6:03 ` Greg Kroah-Hartman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).