Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a3a25b5d authored by Su Hui's avatar Su Hui Committed by Greg Kroah-Hartman
Browse files

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: f0a39ae7 ("rtlwifi: rtl8192cu: Add routine phy")
Signed-off-by: default avatarSu Hui <suhui@nfschina.com>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://msgid.link/20231219065739.1895666-6-suhui@nfschina.com


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 6f84a338

drivers/net/wireless/realtek/rtlwifi/rtl8192cu/phy.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

	RT_TRACE(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));