wifi: rtlwifi: rtl8723{be,ae}: using calculate_bit_shift()

[ Upstream commit 5c16618bc06a41ad68fd8499a21d35ef57ca06c2 ]

Using calculate_bit_shift() to replace rtl8723_phy_calculate_bit_shift().
And fix an undefined bitwise shift behavior problem.

Signed-off-by: Su Hui <suhui@nfschina.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://msgid.link/20231219065739.1895666-12-suhui@nfschina.com
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/phy.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/phy.c
index fe9b407..71e29b1 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/phy.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/phy.c
@@ -49,7 +49,7 @@ u32 rtl8723e_phy_query_rf_reg(struct ieee80211_hw *hw,
                                                            rfpath, regaddr);
        }
 
-       bitshift = rtl8723_phy_calculate_bit_shift(bitmask);
+       bitshift = calculate_bit_shift(bitmask);
        readback_value = (original_value & bitmask) >> bitshift;
 
        spin_unlock(&rtlpriv->locks.rf_lock);
@@ -80,7 +80,7 @@ void rtl8723e_phy_set_rf_reg(struct ieee80211_hw *hw,
                        original_value = rtl8723_phy_rf_serial_read(hw,
                                                                    rfpath,
                                                                    regaddr);
-                       bitshift = rtl8723_phy_calculate_bit_shift(bitmask);
+                       bitshift = calculate_bit_shift(bitmask);
                        data =
                            ((original_value & (~bitmask)) |
                             (data << bitshift));
@@ -89,7 +89,7 @@ void rtl8723e_phy_set_rf_reg(struct ieee80211_hw *hw,
                rtl8723_phy_rf_serial_write(hw, rfpath, regaddr, data);
        } else {
                if (bitmask != RFREG_OFFSET_MASK) {
-                       bitshift = rtl8723_phy_calculate_bit_shift(bitmask);
+                       bitshift = calculate_bit_shift(bitmask);
                        data =
                            ((original_value & (~bitmask)) |
                             (data << bitshift));

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/phy.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/phy.c
index 2b9313c..094cb36 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/phy.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/phy.c
@@ -41,7 +41,7 @@ u32 rtl8723be_phy_query_rf_reg(struct ieee80211_hw *hw, enum radio_path rfpath,
        spin_lock(&rtlpriv->locks.rf_lock);
 
        original_value = rtl8723_phy_rf_serial_read(hw, rfpath, regaddr);
-       bitshift = rtl8723_phy_calculate_bit_shift(bitmask);
+       bitshift = calculate_bit_shift(bitmask);
        readback_value = (original_value & bitmask) >> bitshift;
 
        spin_unlock(&rtlpriv->locks.rf_lock);
@@ -68,7 +68,7 @@ void rtl8723be_phy_set_rf_reg(struct ieee80211_hw *hw, enum radio_path path,
        if (bitmask != RFREG_OFFSET_MASK) {
                        original_value = rtl8723_phy_rf_serial_read(hw, path,
                                                                    regaddr);
-                       bitshift = rtl8723_phy_calculate_bit_shift(bitmask);
+                       bitshift = calculate_bit_shift(bitmask);
                        data = ((original_value & (~bitmask)) |
                                (data << bitshift));
                }