rtlwifi: rtl8192se: remove duplicated legacy_httxpowerdiff
PATCH 1/1 rtlwifi: rtl8192se: remove duplicated legacy_httxpowerdiff
From: Chris Chiu <[email protected]>
The legacy_httxpowerdiff in rtl8192se is pretty much the same as the legacy_ht_txpowerdiff for other chips. Use the same name to keep the consistency.
--- drivers/net/wireless/realtek/rtlwifi/rtl8192se/hw.c | 2 +- drivers/net/wireless/realtek/rtlwifi/rtl8192se/rf.c | 2 +- drivers/net/wireless/realtek/rtlwifi/wifi.h | 1 - 3 files changed, 2 insertions(+), 3 deletions(-)
drivers/net/wireless/realtek/rtlwifi/rtl8192se/hw.c +1 -1
@@ -1906,7 +1906,7 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw)* index diff of legacy to HT OFDM rate. */ tempval = hwinfo[EEPROM_RFIND_POWERDIFF ] &0xff ; rtlefuse->eeprom_txpowerdiff = tempval; - rtlefuse->legacy_httxpowerdiff = + rtlefuse->legacy_ht_txpowerdiff = rtlefuse->txpwr_legacyhtdiff[RF90_PATH_A ][0 ]; RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
drivers/net/wireless/realtek/rtlwifi/rtl8192se/rf.c +1 -1
@@ -25,7 +25,7 @@ static void _rtl92s_get_powerbase(struct ieee80211_hw *hw, u8 *p_pwrlevel,/* We only care about the path A for legacy. */ if (rtlefuse->eeprom_version <2 ) { - pwrbase0 = pwrlevel[0 ] + (rtlefuse->legacy_httxpowerdiff &0xf ); + pwrbase0 = pwrlevel[0 ] + (rtlefuse->legacy_ht_txpowerdiff &0xf ); }else { legacy_pwrdiff = rtlefuse->txpwr_legacyhtdiff [RF90_PATH_A ][chnl -1 ];
drivers/net/wireless/realtek/rtlwifi/wifi.h +0 -1
@@ -1966,7 +1966,6 @@ struct rtl_efuse {u8 txpwr_safetyflag;/* Band edge enable flag */ u16 eeprom_txpowerdiff; -u8 legacy_httxpowerdiff;/* Legacy to HT rate power diff */ u8 antenna_txpwdiff[3 ];u8 eeprom_regulatory;
Signature · 1 line
2.20.1
Quoted 6 lines · Chris Chiu
From: Chris Chiu <[email protected]>
The
legacy_httxpowerdiffin rtl8192se is pretty much the same as thelegacy_ht_txpowerdifffor other chips. Use the same name to keep the consistency.
Quoted 6 lines
Signed-off-by Chris Chiu <[email protected]>--- drivers/net/wireless/realtek/rtlwifi/rtl8192se/hw.c | 2 +- drivers/net/wireless/realtek/rtlwifi/rtl8192se/rf.c | 2 +- drivers/net/wireless/realtek/rtlwifi/wifi.h | 1 - 3 files changed, 2 insertions(+), 3 deletions(-)
Then can't all the struct definitions that include legacy_ht_txpowerdiff other than wifi.h delete it too?
$ git grep -P -n '\blegacy_ht_?txpower' -- '*.h' drivers/net/wireless/realtek/rtlwifi/rtl8188ee/phy.h:162: u8 legacy_ht_txpowerdiff; drivers/net/wireless/realtek/rtlwifi/rtl8192c/phy_common.h:155: u8 legacy_ht_txpowerdiff; drivers/net/wireless/realtek/rtlwifi/rtl8723ae/phy.h:140: u8 legacy_ht_txpowerdiff; drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.h:170: u8 legacy_ht_txpowerdiff; drivers/net/wireless/realtek/rtlwifi/wifi.h:1969: u8 legacy_httxpowerdiff; /* Legacy to HT rate power diff */ drivers/net/wireless/realtek/rtlwifi/wifi.h:1980: u8 legacy_ht_txpowerdiff; /*Legacy to HT rate power diff */
Quoted 7 lines · Chris Chiu
From: Chris Chiu <[email protected]>
The
legacy_httxpowerdiffin rtl8192se is pretty much the same as thelegacy_ht_txpowerdifffor other chips. Use the same name to keep the consistency.Signed-off-by Chris Chiu <[email protected]>
Patch applied to wireless-drivers-next.git, thanks.
8b2426c50f20 rtlwifi: rtl8192se: remove duplicated legacy_httxpowerdiff
Signature · 3 lines
https://patchwork.kernel.org/patch/11818043/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches