hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ath9k_hw: remove ATH9K_CAP_TXPOW 

replace calls that read this capability with accesses to ath9k_hw's
regulatory data.

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Felix Fietkau 2010-06-12 17:22:29 +02:00 committed by John W. Linville
parent 716f7fc5b8
commit 9cc3271faa
4 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/wireless/ath/ath9k/htc_drv_main.c
View File

@ -27,13 +27,11 @@ static struct dentry *ath9k_debugfs_root;
static void ath_update_txpow(struct ath9k_htc_priv *priv) static void ath_update_txpow(struct ath9k_htc_priv *priv)
{ {
struct ath_hw *ah = priv->ah; struct ath_hw *ah = priv->ah;
u32 txpow;
if (priv->curtxpow != priv->txpowlimit) { if (priv->curtxpow != priv->txpowlimit) {
ath9k_hw_set_txpowerlimit(ah, priv->txpowlimit); ath9k_hw_set_txpowerlimit(ah, priv->txpowlimit);
/* read back in case value is clamped */ /* read back in case value is clamped */
ath9k_hw_getcapability(ah, ATH9K_CAP_TXPOW, 1, &txpow); priv->curtxpow = ath9k_hw_regulatory(ah)->power_limit;
priv->curtxpow = txpow;
} }
} }

16
drivers/net/wireless/ath/ath9k/hw.c
View File

@ -2258,7 +2258,6 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah)
bool ath9k_hw_getcapability(struct ath_hw *ah, enum ath9k_capability_type type, bool ath9k_hw_getcapability(struct ath_hw *ah, enum ath9k_capability_type type,
u32 capability, u32 *result) u32 capability, u32 *result)
{ {
struct ath_regulatory *regulatory = ath9k_hw_regulatory(ah);
switch (type) { switch (type) {
case ATH9K_CAP_TKIP_MIC: case ATH9K_CAP_TKIP_MIC:
switch (capability) { switch (capability) {
@ -2286,21 +2285,6 @@ bool ath9k_hw_getcapability(struct ath_hw *ah, enum ath9k_capability_type type,
} }
} }
return false; return false;
case ATH9K_CAP_TXPOW:
switch (capability) {
case 0:
return 0;
case 1:
*result = regulatory->power_limit;
return 0;
case 2:
*result = regulatory->max_power_level;
return 0;
case 3:
*result = regulatory->tp_scale;
return 0;
}
return false;
case ATH9K_CAP_DS: case ATH9K_CAP_DS:
return (AR_SREV_9280_20_OR_LATER(ah) && return (AR_SREV_9280_20_OR_LATER(ah) &&
(ah->eep_ops->get_eeprom(ah, EEP_RC_CHAIN_MASK) == 1)) (ah->eep_ops->get_eeprom(ah, EEP_RC_CHAIN_MASK) == 1))

1
drivers/net/wireless/ath/ath9k/hw.h
View File

@ -209,7 +209,6 @@ enum ath9k_hw_caps {
enum ath9k_capability_type { enum ath9k_capability_type {
ATH9K_CAP_TKIP_MIC, ATH9K_CAP_TKIP_MIC,
ATH9K_CAP_TKIP_SPLIT, ATH9K_CAP_TKIP_SPLIT,
ATH9K_CAP_TXPOW,
ATH9K_CAP_MCAST_KEYSRCH, ATH9K_CAP_MCAST_KEYSRCH,
ATH9K_CAP_DS ATH9K_CAP_DS
}; };

4
drivers/net/wireless/ath/ath9k/main.c
View File

@ -51,13 +51,11 @@ static void ath_cache_conf_rate(struct ath_softc *sc,
static void ath_update_txpow(struct ath_softc *sc) static void ath_update_txpow(struct ath_softc *sc)
{ {
struct ath_hw *ah = sc->sc_ah; struct ath_hw *ah = sc->sc_ah;
u32 txpow;
if (sc->curtxpow != sc->config.txpowlimit) { if (sc->curtxpow != sc->config.txpowlimit) {
ath9k_hw_set_txpowerlimit(ah, sc->config.txpowlimit); ath9k_hw_set_txpowerlimit(ah, sc->config.txpowlimit);
/* read back in case value is clamped */ /* read back in case value is clamped */
ath9k_hw_getcapability(ah, ATH9K_CAP_TXPOW, 1, &txpow); sc->curtxpow = ath9k_hw_regulatory(ah)->power_limit;
sc->curtxpow = txpow;
} }
} }