rtlwifi: rtl8192se: remove duplicated legacy_httxpowerdiff

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.

Signed-off-by: Chris Chiu <chiu@endlessos.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20201006035928.5566-1-chiu@endlessm.com

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/hw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/hw.c
index 149fa4c4ed28f78d86a2a34f39993e07138050ea..47fabce5c2359c3c665c2afffb7f0cd41f384670 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/hw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/hw.c
@@ -1905,7 +1905,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,

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/rf.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/rf.c
index 85f6d0d4dd799805239260f91a1c7f2f0a54e0cb..5a493602aaf24d435c99d3f440532f6df62e8279 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/rf.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/rf.c
@@ -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];

diff --git a/drivers/net/wireless/realtek/rtlwifi/wifi.h b/drivers/net/wireless/realtek/rtlwifi/wifi.h
index 7e80fd829014d70b19867370a3caf7a8da5e277f..fdccfd29fd6186a32613705118500fc9cf7efe3b 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/wifi.h
+++ b/drivers/net/wireless/realtek/rtlwifi/wifi.h
@@ -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;