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

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

wifi: rtlwifi: rtl8192c: using calculate_bit_shift() 



[ Upstream commit 1dedc3a6699d827d345019e921b8d8f37f694333 ]

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

Fixes: 4295cd25 ("rtlwifi: Move common parts of rtl8192ce/phy.c")
Signed-off-by: default avatarSu Hui <suhui@nfschina.com>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://msgid.link/20231219065739.1895666-5-suhui@nfschina.com


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

drivers/net/wireless/realtek/rtlwifi/rtl8192c/phy_common.c

+2 −10
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ u32 rtl92c_phy_query_bb_reg(struct ieee80211_hw *hw, u32 regaddr, u32 bitmask) 
	RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, "regaddr(%#x), bitmask(%#x)\n",

		 regaddr, bitmask);

	originalvalue = rtl_read_dword(rtlpriv, regaddr);

	bitshift = _rtl92c_phy_calculate_bit_shift(bitmask);

	bitshift = calculate_bit_shift(bitmask);

	returnvalue = (originalvalue & bitmask) >> bitshift;



	RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
@@ -40,7 +40,7 @@ void rtl92c_phy_set_bb_reg(struct ieee80211_hw *hw, 


	if (bitmask != MASKDWORD) {

		originalvalue = rtl_read_dword(rtlpriv, regaddr);

		bitshift = _rtl92c_phy_calculate_bit_shift(bitmask);

		bitshift = calculate_bit_shift(bitmask);

		data = ((originalvalue & (~bitmask)) | (data << bitshift));

	}
@@ -143,14 +143,6 @@ void _rtl92c_phy_rf_serial_write(struct ieee80211_hw *hw, 
}

EXPORT_SYMBOL(_rtl92c_phy_rf_serial_write);



u32 _rtl92c_phy_calculate_bit_shift(u32 bitmask)

{

	u32 i = ffs(bitmask);



	return i ? i - 1 : 32;

}

EXPORT_SYMBOL(_rtl92c_phy_calculate_bit_shift);



static void _rtl92c_phy_bb_config_1t(struct ieee80211_hw *hw)

{

	rtl_set_bbreg(hw, RFPGA0_TXINFO, 0x3, 0x2);

drivers/net/wireless/realtek/rtlwifi/rtl8192c/phy_common.h

+0 −1
Original line number Diff line number Diff line
@@ -196,7 +196,6 @@ bool rtl92c_phy_set_rf_power_state(struct ieee80211_hw *hw, 
void rtl92ce_phy_set_rf_on(struct ieee80211_hw *hw);

void rtl92c_phy_set_io(struct ieee80211_hw *hw);

void rtl92c_bb_block_on(struct ieee80211_hw *hw);

u32 _rtl92c_phy_calculate_bit_shift(u32 bitmask);

long _rtl92c_phy_txpwr_idx_to_dbm(struct ieee80211_hw *hw,

				  enum wireless_mode wirelessmode,

				  u8 txpwridx);