wifi: rtlwifi: rtl8821ae: phy: using calculate_bit_shift()

using calculate_bit_shift() to replace
_rtl8821ae_phy_calculate_bit_shift().

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

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c
index 68c3fb0395ce4a2d1ecb7e29fcb1ac42724587a2..1be51ea3f3c8200ba4e64b1e87824f5f6d1ce5f7 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c
@@ -27,13 +27,6 @@ static u32 _rtl8821ae_phy_rf_serial_read(struct ieee80211_hw *hw,
 static void _rtl8821ae_phy_rf_serial_write(struct ieee80211_hw *hw,
                                           enum radio_path rfpath, u32 offset,
                                           u32 data);
-static u32 _rtl8821ae_phy_calculate_bit_shift(u32 bitmask)
-{
-       if (WARN_ON_ONCE(!bitmask))
-               return 0;
-
-       return __ffs(bitmask);
-}
 static bool _rtl8821ae_phy_bb8821a_config_parafile(struct ieee80211_hw *hw);
 /*static bool _rtl8812ae_phy_config_mac_with_headerfile(struct ieee80211_hw *hw);*/
 static bool _rtl8821ae_phy_config_mac_with_headerfile(struct ieee80211_hw *hw);
@@ -106,7 +99,7 @@ u32 rtl8821ae_phy_query_bb_reg(struct ieee80211_hw *hw, u32 regaddr,
                "regaddr(%#x), bitmask(%#x)\n",
                regaddr, bitmask);
        originalvalue = rtl_read_dword(rtlpriv, regaddr);
-       bitshift = _rtl8821ae_phy_calculate_bit_shift(bitmask);
+       bitshift = calculate_bit_shift(bitmask);
        returnvalue = (originalvalue & bitmask) >> bitshift;
 
        rtl_dbg(rtlpriv, COMP_RF, DBG_TRACE,
@@ -127,7 +120,7 @@ void rtl8821ae_phy_set_bb_reg(struct ieee80211_hw *hw,
 
        if (bitmask != MASKDWORD) {
                originalvalue = rtl_read_dword(rtlpriv, regaddr);
-               bitshift = _rtl8821ae_phy_calculate_bit_shift(bitmask);
+               bitshift = calculate_bit_shift(bitmask);
                data = ((originalvalue & (~bitmask)) |
                        ((data << bitshift) & bitmask));
        }
@@ -153,7 +146,7 @@ u32 rtl8821ae_phy_query_rf_reg(struct ieee80211_hw *hw,
        spin_lock(&rtlpriv->locks.rf_lock);
 
        original_value = _rtl8821ae_phy_rf_serial_read(hw, rfpath, regaddr);
-       bitshift = _rtl8821ae_phy_calculate_bit_shift(bitmask);
+       bitshift = calculate_bit_shift(bitmask);
        readback_value = (original_value & bitmask) >> bitshift;
 
        spin_unlock(&rtlpriv->locks.rf_lock);
@@ -181,7 +174,7 @@ void rtl8821ae_phy_set_rf_reg(struct ieee80211_hw *hw,
        if (bitmask != RFREG_OFFSET_MASK) {
                original_value =
                   _rtl8821ae_phy_rf_serial_read(hw, rfpath, regaddr);
-               bitshift = _rtl8821ae_phy_calculate_bit_shift(bitmask);
+               bitshift = calculate_bit_shift(bitmask);
                data = ((original_value & (~bitmask)) | (data << bitshift));
        }