diff options
author | Ben Greear <greearb@candelatech.com> | 2012-04-17 18:19:03 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-04-23 15:28:34 -0400 |
commit | 990e08a0f6115ce93b480325a575b535c92513ee (patch) | |
tree | 716d82c1ac94f5b3cc5562265867c9a253a462b5 | |
parent | 8a690674e0601efbe9a7b16a5826fc522645cca3 (diff) |
ath9k: Fix compile warnings when DEBUGFS is disabled.
This fixes two compile warnings, and removes a useless
cast when assigning the 'sc' variable.
Reported-by: Gabor Juhos <juhosg@openwrt.org>
Signed-off-by: Ben Greear <greearb@candelatech.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/ath/ath9k/hw.h | 3 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/recv.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h index dd4b8f4097c8..8c827a183fc0 100644 --- a/drivers/net/wireless/ath/ath9k/hw.h +++ b/drivers/net/wireless/ath/ath9k/hw.h | |||
@@ -959,7 +959,8 @@ bool ath9k_hw_setpower(struct ath_hw *ah, enum ath9k_power_mode mode); | |||
959 | #ifdef CONFIG_ATH9K_DEBUGFS | 959 | #ifdef CONFIG_ATH9K_DEBUGFS |
960 | void ath9k_debug_sync_cause(struct ath_common *common, u32 sync_cause); | 960 | void ath9k_debug_sync_cause(struct ath_common *common, u32 sync_cause); |
961 | #else | 961 | #else |
962 | static void ath9k_debug_sync_cause(struct ath_common *common, u32 sync_cause) {} | 962 | static inline void ath9k_debug_sync_cause(struct ath_common *common, |
963 | u32 sync_cause) {} | ||
963 | #endif | 964 | #endif |
964 | 965 | ||
965 | /* Generic hw timer primitives */ | 966 | /* Generic hw timer primitives */ |
diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c index 301ef3e57145..12b09798864a 100644 --- a/drivers/net/wireless/ath/ath9k/recv.c +++ b/drivers/net/wireless/ath/ath9k/recv.c | |||
@@ -907,7 +907,7 @@ static int ath9k_process_rate(struct ath_common *common, | |||
907 | struct ieee80211_supported_band *sband; | 907 | struct ieee80211_supported_band *sband; |
908 | enum ieee80211_band band; | 908 | enum ieee80211_band band; |
909 | unsigned int i = 0; | 909 | unsigned int i = 0; |
910 | struct ath_softc *sc = (struct ath_softc *) common->priv; | 910 | struct ath_softc __maybe_unused *sc = common->priv; |
911 | 911 | ||
912 | band = hw->conf.channel->band; | 912 | band = hw->conf.channel->band; |
913 | sband = hw->wiphy->bands[band]; | 913 | sband = hw->wiphy->bands[band]; |