wifi: rtl8xxxu: Define masks for cck_agc_rpt bits

Define the constants CCK_AGC_RPT_LNA_IDX_MASK and
CCK_AGC_RPT_VGA_IDX_MASK instead of using the same literals
in four places.

And get the bits from cck_agc_rpt using u8_get_bits().

It's a cosmetic change only.

Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>
Reviewed-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/cfe79922-efdf-2ed0-7404-263915d19d82@gmail.com

diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
index 87758295d6188728e1d50b90b8d55f0cb06d30dd..15bb2b5211a882b4d3cf4f33a93bf834fd7faf47 100644 (file)
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
@@ -562,6 +562,9 @@ struct phy_rx_agc_info {
 #endif
 };
 
+#define CCK_AGC_RPT_LNA_IDX_MASK       GENMASK(7, 5)
+#define CCK_AGC_RPT_VGA_IDX_MASK       GENMASK(4, 0)
+
 struct rtl8723au_phy_stats {
        struct phy_rx_agc_info path_agc[RTL8723A_MAX_RF_PATHS];
        u8      ch_corr[RTL8723A_MAX_RF_PATHS];

diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188f.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188f.c
index c8fdd6199b334d981b0abdfc00ca783ee977d9a4..7d5d980f3bbbcd1428d1a358bdb64aa824d95d5b 100644 (file)
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188f.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188f.c
@@ -1682,8 +1682,8 @@ static s8 rtl8188f_cck_rssi(struct rtl8xxxu_priv *priv, u8 cck_agc_rpt)
        s8 rx_pwr_all = 0x00;
        u8 vga_idx, lna_idx;
 
-       lna_idx = (cck_agc_rpt & 0xE0) >> 5;
-       vga_idx = cck_agc_rpt & 0x1F;
+       lna_idx = u8_get_bits(cck_agc_rpt, CCK_AGC_RPT_LNA_IDX_MASK);
+       vga_idx = u8_get_bits(cck_agc_rpt, CCK_AGC_RPT_VGA_IDX_MASK);
 
        switch (lna_idx) {
        case 7:

diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c
index e4afdfed06aceaa58180e1ba22d704acdbe94ed4..247d88362f6846fe374971bea1907c565570a16d 100644 (file)
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c
@@ -1746,8 +1746,8 @@ static s8 rtl8192e_cck_rssi(struct rtl8xxxu_priv *priv, u8 cck_agc_rpt)
        u8 vga_idx, lna_idx;
        s8 lna_gain = 0;
 
-       lna_idx = (cck_agc_rpt & 0xE0) >> 5;
-       vga_idx = cck_agc_rpt & 0x1F;
+       lna_idx = u8_get_bits(cck_agc_rpt, CCK_AGC_RPT_LNA_IDX_MASK);
+       vga_idx = u8_get_bits(cck_agc_rpt, CCK_AGC_RPT_VGA_IDX_MASK);
 
        if (priv->cck_agc_report_type == 0)
                lna_gain = lna_gain_table_0[lna_idx];

diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c
index 65ebf9dcf5f9a147557e0c845c16b73db4acf198..0ed667d5ed2564597bbf1de2ba877bcd4f263d90 100644 (file)
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c
@@ -1680,8 +1680,8 @@ static s8 rtl8723b_cck_rssi(struct rtl8xxxu_priv *priv, u8 cck_agc_rpt)
        s8 rx_pwr_all = 0x00;
        u8 vga_idx, lna_idx;
 
-       lna_idx = (cck_agc_rpt & 0xE0) >> 5;
-       vga_idx = cck_agc_rpt & 0x1F;
+       lna_idx = u8_get_bits(cck_agc_rpt, CCK_AGC_RPT_LNA_IDX_MASK);
+       vga_idx = u8_get_bits(cck_agc_rpt, CCK_AGC_RPT_VGA_IDX_MASK);
 
        switch (lna_idx) {
        case 6: