From: Su Hui <suhui@nfschina.com>
To: pkshih@realtek.com, kvalo@kernel.org
Cc: Su Hui <suhui@nfschina.com>,
linville@tuxdriver.com, chaoming_li@realsil.com.cn,
Larry.Finger@lwfinger.net, linux-wireless@vger.kernel.org,
linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: [PATCH wireless-next 07/11] wifi: rtlwifi: rtl8192de: using calculate_bit_shift()
Date: Tue, 19 Dec 2023 14:57:35 +0800 [thread overview]
Message-ID: <20231219065739.1895666-8-suhui@nfschina.com> (raw)
In-Reply-To: <20231219065739.1895666-1-suhui@nfschina.com>
Using calculate_bit_shift() to replace _rtl92d_phy_calculate_bit_shift().
And fix the undefined bitwise shift behavior problem.
Fixes: 7274a8c22980 ("rtlwifi: rtl8192de: Merge phy routines")
Signed-off-by: Su Hui <suhui@nfschina.com>
---
.../net/wireless/realtek/rtlwifi/rtl8192de/phy.c | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c
index d18c092b6142..d835a27429f0 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c
@@ -169,13 +169,6 @@ static const u8 channel_all[59] = {
157, 159, 161, 163, 165
};
-static u32 _rtl92d_phy_calculate_bit_shift(u32 bitmask)
-{
- u32 i = ffs(bitmask);
-
- return i ? i - 1 : 32;
-}
-
u32 rtl92d_phy_query_bb_reg(struct ieee80211_hw *hw, u32 regaddr, u32 bitmask)
{
struct rtl_priv *rtlpriv = rtl_priv(hw);
@@ -198,7 +191,7 @@ u32 rtl92d_phy_query_bb_reg(struct ieee80211_hw *hw, u32 regaddr, u32 bitmask)
} else {
originalvalue = rtl_read_dword(rtlpriv, regaddr);
}
- bitshift = _rtl92d_phy_calculate_bit_shift(bitmask);
+ bitshift = calculate_bit_shift(bitmask);
returnvalue = (originalvalue & bitmask) >> bitshift;
rtl_dbg(rtlpriv, COMP_RF, DBG_TRACE,
"BBR MASK=0x%x Addr[0x%x]=0x%x\n",
@@ -230,7 +223,7 @@ void rtl92d_phy_set_bb_reg(struct ieee80211_hw *hw,
dbi_direct);
else
originalvalue = rtl_read_dword(rtlpriv, regaddr);
- bitshift = _rtl92d_phy_calculate_bit_shift(bitmask);
+ bitshift = calculate_bit_shift(bitmask);
data = ((originalvalue & (~bitmask)) | (data << bitshift));
}
if (rtlhal->during_mac1init_radioa || rtlhal->during_mac0init_radiob)
@@ -317,7 +310,7 @@ u32 rtl92d_phy_query_rf_reg(struct ieee80211_hw *hw,
regaddr, rfpath, bitmask);
spin_lock(&rtlpriv->locks.rf_lock);
original_value = _rtl92d_phy_rf_serial_read(hw, rfpath, regaddr);
- bitshift = _rtl92d_phy_calculate_bit_shift(bitmask);
+ bitshift = calculate_bit_shift(bitmask);
readback_value = (original_value & bitmask) >> bitshift;
spin_unlock(&rtlpriv->locks.rf_lock);
rtl_dbg(rtlpriv, COMP_RF, DBG_TRACE,
@@ -343,7 +336,7 @@ void rtl92d_phy_set_rf_reg(struct ieee80211_hw *hw, enum radio_path rfpath,
if (bitmask != RFREG_OFFSET_MASK) {
original_value = _rtl92d_phy_rf_serial_read(hw,
rfpath, regaddr);
- bitshift = _rtl92d_phy_calculate_bit_shift(bitmask);
+ bitshift = calculate_bit_shift(bitmask);
data = ((original_value & (~bitmask)) |
(data << bitshift));
}
--
2.30.2
next prev parent reply other threads:[~2023-12-19 6:58 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-19 6:57 [PATCH wireless-next 00/11] using calculate_bit_shift() to fix undefined bitwise shift behavior Su Hui
2023-12-19 6:57 ` [PATCH wireless-next 01/11] wifi: rtlwifi: add calculate_bit_shift() Su Hui
2023-12-20 6:47 ` Ping-Ke Shih
2023-12-21 14:40 ` Kalle Valo
2023-12-19 6:57 ` [PATCH wireless-next 02/11] wifi: rtlwifi: rtl8821ae: phy: using calculate_bit_shift() Su Hui
2023-12-19 6:57 ` [PATCH wireless-next 03/11] wifi: rtlwifi: rtl8188ee: " Su Hui
2023-12-19 6:57 ` [PATCH wireless-next 04/11] wifi: rtlwifi: rtl8192c: " Su Hui
2023-12-19 6:57 ` [PATCH wireless-next 05/11] wifi: rtlwifi: rtl8192cu: " Su Hui
2023-12-19 6:57 ` [PATCH wireless-next 06/11] wifi: rtlwifi: rtl8192ce: " Su Hui
2023-12-19 6:57 ` Su Hui [this message]
2023-12-19 6:57 ` [PATCH wireless-next 08/11] wifi: rtlwifi: rtl8192ee: " Su Hui
2023-12-19 6:57 ` [PATCH wireless-next 09/11] wifi: rtlwifi: rtl8192se: " Su Hui
2023-12-19 6:57 ` [PATCH wireless-next 10/11] wifi: rtlwifi: rtl8723_common: " Su Hui
2023-12-19 6:57 ` [PATCH wireless-next 11/11] wifi: rtlwifi: rtl8723{be,ae}: " Su Hui
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231219065739.1895666-8-suhui@nfschina.com \
--to=suhui@nfschina.com \
--cc=Larry.Finger@lwfinger.net \
--cc=chaoming_li@realsil.com.cn \
--cc=kernel-janitors@vger.kernel.org \
--cc=kvalo@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=pkshih@realtek.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.