aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-agn.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2011-09-15 14:46:45 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-09-19 16:10:09 -0400
commitc01a404756ef7dd4089b3d5d2010cba99732e385 (patch)
treea971c8eb1a2391141fab46469463bfbc63b5e54c /drivers/net/wireless/iwlwifi/iwl-agn.c
parent72afb108ad679f0694d3232ffdd34b0e906773ef (diff)
iwlagn: clean up PM code
The transport callbacks might as well be undefined when CONFIG_PM_SLEEP is not set, so ifdef all of it out and make everything available for PM_SLEEP only. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index 61f8ea6413c0..5c85133219e6 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -1919,7 +1919,7 @@ static void iwlagn_mac_stop(struct ieee80211_hw *hw)
1919 IWL_DEBUG_MAC80211(priv, "leave\n"); 1919 IWL_DEBUG_MAC80211(priv, "leave\n");
1920} 1920}
1921 1921
1922#ifdef CONFIG_PM 1922#ifdef CONFIG_PM_SLEEP
1923static int iwlagn_send_patterns(struct iwl_priv *priv, 1923static int iwlagn_send_patterns(struct iwl_priv *priv,
1924 struct cfg80211_wowlan *wowlan) 1924 struct cfg80211_wowlan *wowlan)
1925{ 1925{
@@ -1994,7 +1994,7 @@ struct wowlan_key_data {
1994 bool error, use_rsc_tsc, use_tkip; 1994 bool error, use_rsc_tsc, use_tkip;
1995}; 1995};
1996 1996
1997#ifdef CONFIG_PM 1997#ifdef CONFIG_PM_SLEEP
1998static void iwlagn_convert_p1k(u16 *p1k, __le16 *out) 1998static void iwlagn_convert_p1k(u16 *p1k, __le16 *out)
1999{ 1999{
2000 int i; 2000 int i;
@@ -3203,7 +3203,7 @@ struct ieee80211_ops iwlagn_hw_ops = {
3203 .tx = iwlagn_mac_tx, 3203 .tx = iwlagn_mac_tx,
3204 .start = iwlagn_mac_start, 3204 .start = iwlagn_mac_start,
3205 .stop = iwlagn_mac_stop, 3205 .stop = iwlagn_mac_stop,
3206#ifdef CONFIG_PM 3206#ifdef CONFIG_PM_SLEEP
3207 .suspend = iwlagn_mac_suspend, 3207 .suspend = iwlagn_mac_suspend,
3208 .resume = iwlagn_mac_resume, 3208 .resume = iwlagn_mac_resume,
3209#endif 3209#endif