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

Commit 4a20fa73 authored by Joe Perches's avatar Joe Perches Committed by Greg Kroah-Hartman
Browse files

rtlwifi: Use ffs in <foo>_phy_calculate_bit_shift 



[ Upstream commit 6c1d61913570d4255548ac598cfbef6f1e3c3eee ]

Remove the loop and use the generic ffs instead.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/e2ab424d24b74901bc0c39f0c60f75e871adf2ba.camel@perches.com


Stable-dep-of: bc8263083af6 ("wifi: rtlwifi: rtl8821ae: phy: fix an undefined bitwise shift behavior")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 0226926b

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

+6 −12
Original line number Diff line number Diff line
@@ -16,7 +16,12 @@ static u32 _rtl88e_phy_rf_serial_read(struct ieee80211_hw *hw, 
static void _rtl88e_phy_rf_serial_write(struct ieee80211_hw *hw,

					enum radio_path rfpath, u32 offset,

					u32 data);

static u32 _rtl88e_phy_calculate_bit_shift(u32 bitmask);

static u32 _rtl88e_phy_calculate_bit_shift(u32 bitmask)

{

	u32 i = ffs(bitmask);



	return i ? i - 1 : 32;

}

static bool _rtl88e_phy_bb8188e_config_parafile(struct ieee80211_hw *hw);

static bool _rtl88e_phy_config_mac_with_headerfile(struct ieee80211_hw *hw);

static bool phy_config_bb_with_headerfile(struct ieee80211_hw *hw,
@@ -210,17 +215,6 @@ static void _rtl88e_phy_rf_serial_write(struct ieee80211_hw *hw, 
		 rfpath, pphyreg->rf3wire_offset, data_and_addr);

}



static u32 _rtl88e_phy_calculate_bit_shift(u32 bitmask)

{

	u32 i;



	for (i = 0; i <= 31; i++) {

		if (((bitmask >> i) & 0x1) == 1)

			break;

	}

	return i;

}



bool rtl88e_phy_mac_config(struct ieee80211_hw *hw)

{

	struct rtl_priv *rtlpriv = rtl_priv(hw);

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

+2 −6
Original line number Diff line number Diff line
@@ -145,13 +145,9 @@ EXPORT_SYMBOL(_rtl92c_phy_rf_serial_write); 


u32 _rtl92c_phy_calculate_bit_shift(u32 bitmask)

{

	u32 i;

	u32 i = ffs(bitmask);



	for (i = 0; i <= 31; i++) {

		if (((bitmask >> i) & 0x1) == 1)

			break;

	}

	return i;

	return i ? i - 1 : 32;

}

EXPORT_SYMBOL(_rtl92c_phy_calculate_bit_shift);

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

+2 −7
Original line number Diff line number Diff line
@@ -162,14 +162,9 @@ static u32 targetchnl_2g[TARGET_CHNL_NUM_2G] = { 


static u32 _rtl92d_phy_calculate_bit_shift(u32 bitmask)

{

	u32 i;



	for (i = 0; i <= 31; i++) {

		if (((bitmask >> i) & 0x1) == 1)

			break;

	}

	u32 i = ffs(bitmask);



	return i;

	return i ? i - 1 : 32;

}



u32 rtl92d_phy_query_bb_reg(struct ieee80211_hw *hw, u32 regaddr, u32 bitmask)

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

+2 −6
Original line number Diff line number Diff line
@@ -206,13 +206,9 @@ static void _rtl92ee_phy_rf_serial_write(struct ieee80211_hw *hw, 


static u32 _rtl92ee_phy_calculate_bit_shift(u32 bitmask)

{

	u32 i;

	u32 i = ffs(bitmask);



	for (i = 0; i <= 31; i++) {

		if (((bitmask >> i) & 0x1) == 1)

			break;

	}

	return i;

	return i ? i - 1 : 32;

}



bool rtl92ee_phy_mac_config(struct ieee80211_hw *hw)

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

+2 −7
Original line number Diff line number Diff line
@@ -16,14 +16,9 @@ 


static u32 _rtl92s_phy_calculate_bit_shift(u32 bitmask)

{

	u32 i;



	for (i = 0; i <= 31; i++) {

		if (((bitmask >> i) & 0x1) == 1)

			break;

	}

	u32 i = ffs(bitmask);



	return i;

	return i ? i - 1 : 32;

}



u32 rtl92s_phy_query_bb_reg(struct ieee80211_hw *hw, u32 regaddr, u32 bitmask)