wifi: rtlwifi: rtl8192cu: using calculate_bit_shift()

[ Upstream commit f4088c8fcbabadad9dd17d17ae9ba24e9e3221ec ]

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

Fixes: f0a39ae738d6 ("rtlwifi: rtl8192cu: Add routine phy")
Signed-off-by: Su Hui <suhui@nfschina.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://msgid.link/20231219065739.1895666-6-suhui@nfschina.com
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/phy.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/phy.c
index a8d9fe269f3139379385da2b708013f08b0b9320..0b8cb7e61fd802e78ee9748624e106490ceb9b1d 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/phy.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/phy.c
@@ -32,7 +32,7 @@ u32 rtl92cu_phy_query_rf_reg(struct ieee80211_hw *hw,
                original_value = _rtl92c_phy_fw_rf_serial_read(hw,
                                                               rfpath, regaddr);
        }
-       bitshift = _rtl92c_phy_calculate_bit_shift(bitmask);
+       bitshift = calculate_bit_shift(bitmask);
        readback_value = (original_value & bitmask) >> bitshift;
        rtl_dbg(rtlpriv, COMP_RF, DBG_TRACE,
                "regaddr(%#x), rfpath(%#x), bitmask(%#x), original_value(%#x)\n",
@@ -56,7 +56,7 @@ void rtl92cu_phy_set_rf_reg(struct ieee80211_hw *hw,
                        original_value = _rtl92c_phy_rf_serial_read(hw,
                                                                    rfpath,
                                                                    regaddr);
-                       bitshift = _rtl92c_phy_calculate_bit_shift(bitmask);
+                       bitshift = calculate_bit_shift(bitmask);
                        data =
                            ((original_value & (~bitmask)) |
                             (data << bitshift));
@@ -67,7 +67,7 @@ void rtl92cu_phy_set_rf_reg(struct ieee80211_hw *hw,
                        original_value = _rtl92c_phy_fw_rf_serial_read(hw,
                                                                       rfpath,
                                                                       regaddr);
-                       bitshift = _rtl92c_phy_calculate_bit_shift(bitmask);
+                       bitshift = calculate_bit_shift(bitmask);
                        data =
                            ((original_value & (~bitmask)) |
                             (data << bitshift));