diff options
author | Arend van Spriel <arend@broadcom.com> | 2013-06-23 06:51:21 -0400 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2013-06-24 09:57:32 -0400 |
commit | a33d402610d2d3a422136defe8237f4ddfb69fd9 (patch) | |
tree | c9c023f1193ba54bb21e7603690feae687f4908b /net | |
parent | f9bef3df52fe61067e4c1c6cfb2037cb6b259a6a (diff) |
cfg80211: fix compilation warning for cfg80211_leave_all()
The following compilation issue popped up moving from v3.10-rc1 to
v3.10-rc6 after merging wireless-testing.
net/wireless/sysfs.c:86:13: error: 'cfg80211_leave_all' defined
but not used [-Werror=unused-function]
The function is only called when CONFIG_PM is enabled. Moving the
function under CONFIG_PM as well.
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
-rw-r--r-- | net/wireless/sysfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wireless/sysfs.c b/net/wireless/sysfs.c index 360a42c6f694..a23253e06358 100644 --- a/net/wireless/sysfs.c +++ b/net/wireless/sysfs.c | |||
@@ -83,6 +83,7 @@ static int wiphy_uevent(struct device *dev, struct kobj_uevent_env *env) | |||
83 | return 0; | 83 | return 0; |
84 | } | 84 | } |
85 | 85 | ||
86 | #ifdef CONFIG_PM | ||
86 | static void cfg80211_leave_all(struct cfg80211_registered_device *rdev) | 87 | static void cfg80211_leave_all(struct cfg80211_registered_device *rdev) |
87 | { | 88 | { |
88 | struct wireless_dev *wdev; | 89 | struct wireless_dev *wdev; |
@@ -91,7 +92,6 @@ static void cfg80211_leave_all(struct cfg80211_registered_device *rdev) | |||
91 | cfg80211_leave(rdev, wdev); | 92 | cfg80211_leave(rdev, wdev); |
92 | } | 93 | } |
93 | 94 | ||
94 | #ifdef CONFIG_PM | ||
95 | static int wiphy_suspend(struct device *dev, pm_message_t state) | 95 | static int wiphy_suspend(struct device *dev, pm_message_t state) |
96 | { | 96 | { |
97 | struct cfg80211_registered_device *rdev = dev_to_rdev(dev); | 97 | struct cfg80211_registered_device *rdev = dev_to_rdev(dev); |