aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2012-03-07 12:52:15 -0500
committerJohn W. Linville <linville@tuxdriver.com>2012-03-08 13:59:47 -0500
commitea886a6014024d027fa207b8765e46d746cd2a18 (patch)
tree8ea9b658a295074581ac9dec34828ae59ce27ae0 /drivers
parentc1803c9459a9cd751eb46da9e60e49728aae7a5a (diff)
iwlwifi: remove unused argument from iwlagn_suspend
There's not much point in passing priv and hw pointers since they can be derived from each other, and the function doesn't use the hw pointer anyway. Remove it. 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')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn-lib.c3
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn.h3
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-mac80211.c2
3 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
index b2ee1f9373c0..6d8a8578778c 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
@@ -1120,8 +1120,7 @@ int iwlagn_send_patterns(struct iwl_priv *priv,
1120 return err; 1120 return err;
1121} 1121}
1122 1122
1123int iwlagn_suspend(struct iwl_priv *priv, 1123int iwlagn_suspend(struct iwl_priv *priv, struct cfg80211_wowlan *wowlan)
1124 struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
1125{ 1124{
1126 struct iwlagn_wowlan_wakeup_filter_cmd wakeup_filter_cmd; 1125 struct iwlagn_wowlan_wakeup_filter_cmd wakeup_filter_cmd;
1127 struct iwl_rxon_cmd rxon; 1126 struct iwl_rxon_cmd rxon;
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.h b/drivers/net/wireless/iwlwifi/iwl-agn.h
index 8384c057babb..82930ef86ad1 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.h
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.h
@@ -141,8 +141,7 @@ int iwlagn_send_beacon_cmd(struct iwl_priv *priv);
141#ifdef CONFIG_PM_SLEEP 141#ifdef CONFIG_PM_SLEEP
142int iwlagn_send_patterns(struct iwl_priv *priv, 142int iwlagn_send_patterns(struct iwl_priv *priv,
143 struct cfg80211_wowlan *wowlan); 143 struct cfg80211_wowlan *wowlan);
144int iwlagn_suspend(struct iwl_priv *priv, 144int iwlagn_suspend(struct iwl_priv *priv, struct cfg80211_wowlan *wowlan);
145 struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan);
146#endif 145#endif
147 146
148/* rx */ 147/* rx */
diff --git a/drivers/net/wireless/iwlwifi/iwl-mac80211.c b/drivers/net/wireless/iwlwifi/iwl-mac80211.c
index d2c1d714c89c..bdcbbd0d3467 100644
--- a/drivers/net/wireless/iwlwifi/iwl-mac80211.c
+++ b/drivers/net/wireless/iwlwifi/iwl-mac80211.c
@@ -405,7 +405,7 @@ static int iwlagn_mac_suspend(struct ieee80211_hw *hw,
405 goto out; 405 goto out;
406 } 406 }
407 407
408 ret = iwlagn_suspend(priv, hw, wowlan); 408 ret = iwlagn_suspend(priv, wowlan);
409 if (ret) 409 if (ret)
410 goto error; 410 goto error;
411 411