* [PATCH] rtlwifi: rtl8192se: remove duplicated legacy_httxpowerdiff
@ 2020-10-06 3:59 Chris Chiu
2020-10-06 4:10 ` Joe Perches
2020-10-08 10:48 ` Kalle Valo
0 siblings, 2 replies; 3+ messages in thread
From: Chris Chiu @ 2020-10-06 3:59 UTC (permalink / raw)
To: pkshih, kvalo, davem, kuba
Cc: linux-wireless, netdev, linux-kernel, Chris Chiu
From: Chris Chiu <chiu@endlessos.org>
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>
---
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(-)
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/hw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/hw.c
index 81313e0ca834..0cdcddfebca9 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/hw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/hw.c
@@ -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,
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/rf.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/rf.c
index a37855f57e76..54576566083c 100644
--- 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 13421cf2d201..0a516c3c7cea 100644
--- 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;
--
2.20.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] rtlwifi: rtl8192se: remove duplicated legacy_httxpowerdiff
2020-10-06 3:59 [PATCH] rtlwifi: rtl8192se: remove duplicated legacy_httxpowerdiff Chris Chiu
@ 2020-10-06 4:10 ` Joe Perches
2020-10-08 10:48 ` Kalle Valo
1 sibling, 0 replies; 3+ messages in thread
From: Joe Perches @ 2020-10-06 4:10 UTC (permalink / raw)
To: Chris Chiu, pkshih, kvalo, davem, kuba
Cc: linux-wireless, netdev, linux-kernel
On Tue, 2020-10-06 at 11:59 +0800, Chris Chiu wrote:
> From: Chris Chiu <chiu@endlessos.org>
>
> 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>
> ---
> 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 */
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] rtlwifi: rtl8192se: remove duplicated legacy_httxpowerdiff
2020-10-06 3:59 [PATCH] rtlwifi: rtl8192se: remove duplicated legacy_httxpowerdiff Chris Chiu
2020-10-06 4:10 ` Joe Perches
@ 2020-10-08 10:48 ` Kalle Valo
1 sibling, 0 replies; 3+ messages in thread
From: Kalle Valo @ 2020-10-08 10:48 UTC (permalink / raw)
To: Chris Chiu
Cc: pkshih, davem, kuba, linux-wireless, netdev, linux-kernel, Chris Chiu
Chris Chiu <chiu@endlessos.org> wrote:
> From: Chris Chiu <chiu@endlessos.org>
>
> 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>
Patch applied to wireless-drivers-next.git, thanks.
8b2426c50f20 rtlwifi: rtl8192se: remove duplicated legacy_httxpowerdiff
--
https://patchwork.kernel.org/patch/11818043/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-10-08 10:48 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-06 3:59 [PATCH] rtlwifi: rtl8192se: remove duplicated legacy_httxpowerdiff Chris Chiu
2020-10-06 4:10 ` Joe Perches
2020-10-08 10:48 ` Kalle Valo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).