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

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

wifi: rtlwifi: rtl8192ce: using calculate_bit_shift() 



[ Upstream commit 3d03e8231031bcc65a48cd88ef9c71b6524ce70b ]

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

Fixes: 0c817338 ("rtl8192ce: Add new driver")
Signed-off-by: default avatarSu Hui <suhui@nfschina.com>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://msgid.link/20231219065739.1895666-7-suhui@nfschina.com


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

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

+3 −3
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ u32 rtl92c_phy_query_rf_reg(struct ieee80211_hw *hw, 
							       rfpath, regaddr);

	}



	bitshift = _rtl92c_phy_calculate_bit_shift(bitmask);

	bitshift = calculate_bit_shift(bitmask);

	readback_value = (original_value & bitmask) >> bitshift;



	spin_unlock(&rtlpriv->locks.rf_lock);
@@ -110,7 +110,7 @@ void rtl92ce_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));
@@ -122,7 +122,7 @@ void rtl92ce_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));

drivers/net/wireless/realtek/rtlwifi/rtl8192ce/phy.h

+0 −1
Original line number Diff line number Diff line
@@ -94,7 +94,6 @@ u32 _rtl92c_phy_rf_serial_read(struct ieee80211_hw *hw, enum radio_path rfpath, 
			       u32 offset);

u32 _rtl92c_phy_fw_rf_serial_read(struct ieee80211_hw *hw,

				  enum radio_path rfpath, u32 offset);

u32 _rtl92c_phy_calculate_bit_shift(u32 bitmask);

void _rtl92c_phy_rf_serial_write(struct ieee80211_hw *hw,

				 enum radio_path rfpath, u32 offset, u32 data);

void _rtl92c_phy_fw_rf_serial_write(struct ieee80211_hw *hw,