aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath/ath9k/init.c
diff options
context:
space:
mode:
authorLuis R. Rodriguez <mcgrof@do-not-panic.com>2013-01-11 13:39:36 -0500
committerJohannes Berg <johannes.berg@intel.com>2013-01-14 05:32:44 -0500
commit0c0280bd0ba410326eecdaeb1b936696eda6381d (patch)
treed7d2795b3418db1c5b9ffa971c7beeaa2245b0fe /drivers/net/wireless/ath/ath9k/init.c
parent55b183ad8635589ea731a31653de79a2626491c4 (diff)
wireless: make the reg_notifier() void
The reg_notifier()'s return value need not be checked as it is only supposed to do post regulatory work and that should never fail. Any behaviour to regulatory that needs to be considered before cfg80211 does work to a driver should be specified by using the already existing flags, the reg_notifier() just does post processing should it find it needs to. Also make lbs_reg_notifier static. Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com> [move lbs_reg_notifier to not break compile] Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/init.c')
-rw-r--r--drivers/net/wireless/ath/ath9k/init.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c
index f69ef5d48c7b..315d6593e18e 100644
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
@@ -302,16 +302,15 @@ static void setup_ht_cap(struct ath_softc *sc,
302 ht_info->mcs.tx_params |= IEEE80211_HT_MCS_TX_DEFINED; 302 ht_info->mcs.tx_params |= IEEE80211_HT_MCS_TX_DEFINED;
303} 303}
304 304
305static int ath9k_reg_notifier(struct wiphy *wiphy, 305static void ath9k_reg_notifier(struct wiphy *wiphy,
306 struct regulatory_request *request) 306 struct regulatory_request *request)
307{ 307{
308 struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy); 308 struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy);
309 struct ath_softc *sc = hw->priv; 309 struct ath_softc *sc = hw->priv;
310 struct ath_hw *ah = sc->sc_ah; 310 struct ath_hw *ah = sc->sc_ah;
311 struct ath_regulatory *reg = ath9k_hw_regulatory(ah); 311 struct ath_regulatory *reg = ath9k_hw_regulatory(ah);
312 int ret;
313 312
314 ret = ath_reg_notifier_apply(wiphy, request, reg); 313 ath_reg_notifier_apply(wiphy, request, reg);
315 314
316 /* Set tx power */ 315 /* Set tx power */
317 if (ah->curchan) { 316 if (ah->curchan) {
@@ -321,8 +320,6 @@ static int ath9k_reg_notifier(struct wiphy *wiphy,
321 sc->curtxpow = ath9k_hw_regulatory(ah)->power_limit; 320 sc->curtxpow = ath9k_hw_regulatory(ah)->power_limit;
322 ath9k_ps_restore(sc); 321 ath9k_ps_restore(sc);
323 } 322 }
324
325 return ret;
326} 323}
327 324
328/* 325/*