aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2012-09-07 11:25:27 -0400
committerJohannes Berg <johannes.berg@intel.com>2012-09-11 08:43:43 -0400
commit3a6a0d8ee88d23e7dda28808c2c890c4db50ccb2 (patch)
tree6b312f971bdb3afa6b852a49311b36c368c44529 /net/mac80211
parent1bad53824305807bb5cf49d6b588dd9d867586c6 (diff)
mac80211: remove unneeded CONFIG_PM ifdef
The functions are only called if CONFIG_PM is set as the callers are under an ifdef, so there's no need to also define no-op functions. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/ieee80211_i.h13
1 files changed, 0 insertions, 13 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 887452327ba8..d11a6f837d69 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -1368,7 +1368,6 @@ void ieee80211_process_measurement_req(struct ieee80211_sub_if_data *sdata,
1368int ieee80211_reconfig(struct ieee80211_local *local); 1368int ieee80211_reconfig(struct ieee80211_local *local);
1369void ieee80211_stop_device(struct ieee80211_local *local); 1369void ieee80211_stop_device(struct ieee80211_local *local);
1370 1370
1371#ifdef CONFIG_PM
1372int __ieee80211_suspend(struct ieee80211_hw *hw, 1371int __ieee80211_suspend(struct ieee80211_hw *hw,
1373 struct cfg80211_wowlan *wowlan); 1372 struct cfg80211_wowlan *wowlan);
1374 1373
@@ -1382,18 +1381,6 @@ static inline int __ieee80211_resume(struct ieee80211_hw *hw)
1382 1381
1383 return ieee80211_reconfig(hw_to_local(hw)); 1382 return ieee80211_reconfig(hw_to_local(hw));
1384} 1383}
1385#else
1386static inline int __ieee80211_suspend(struct ieee80211_hw *hw,
1387 struct cfg80211_wowlan *wowlan)
1388{
1389 return 0;
1390}
1391
1392static inline int __ieee80211_resume(struct ieee80211_hw *hw)
1393{
1394 return 0;
1395}
1396#endif
1397 1384
1398/* utility functions/constants */ 1385/* utility functions/constants */
1399extern void *mac80211_wiphy_privid; /* for wiphy privid */ 1386extern void *mac80211_wiphy_privid; /* for wiphy privid */