| Message ID | 20210803144949.79433-1-colin.king@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/3,RESEND] rtlwifi: rtl8192de: Remove redundant variable initializations | expand |
On Tue, 2021-08-03 at 15:49 +0100, Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > Currently the size of the entire array is being used in a for-loop > for the element count. While this works since the elements are u8 > sized, it is preferred to use ARRAY_SIZE to get the element count > of the array. [] > diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c [] > @@ -1366,7 +1366,7 @@ u8 rtl92d_get_rightchnlplace_for_iqk(u8 chnl) > u8 place = chnl; > > if (chnl > 14) { > - for (place = 14; place < sizeof(channel_all); place++) { > + for (place = 14; place < ARRAY_SIZE(channel_all); place++) { > if (channel_all[place] == chnl) > return place - 13; > } Thanks. It seems a relatively common copy/paste use in rtlwifi $ git grep -P -n 'for\b.*<\s*sizeof\s*\(\s*\w+\w*\)\s*;' drivers/net/wireless/realtek/rtlwifi/ drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c:893: for (place = 14; place < sizeof(channel5g); place++) { drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c:1368: for (place = 14; place < sizeof(channel_all); place++) { drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c:2430: for (i = 0; i < sizeof(channel5g); i++) drivers/net/wireless/realtek/rtlwifi/rtl8192ee/phy.c:2781: for (place = 14; place < sizeof(channel_all); place++) { drivers/net/wireless/realtek/rtlwifi/rtl8723be/phy.c:2170: for (place = 14; place < sizeof(channel_all); place++) { drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c:3610: for (place = 14; place < sizeof(channel_all); place++)
Colin King <colin.king@canonical.com> wrote: > From: Colin Ian King <colin.king@canonical.com> > > The variables rtstatus and place are being initialized with a values > that are never read, the initializations are redundant and can be removed. > > Addresses-Coverity: ("Unused value") > Signed-off-by: Colin Ian King <colin.king@canonical.com> > Acked-by: Ping-Ke Shih <pkshih@realtek.com> 2 patches applied to wireless-drivers-next.git, thanks. 369956ae5720 rtlwifi: rtl8192de: Remove redundant variable initializations b05897ca8c82 rtlwifi: rtl8192de: make arrays static const, makes object smaller -- https://patchwork.kernel.org/project/linux-wireless/patch/20210803144949.79433-1-colin.king@canonical.com/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c index 76dd881ef9bb..50c2d8f6f9c0 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c @@ -681,7 +681,7 @@ static bool _rtl92d_phy_bb_config(struct ieee80211_hw *hw) struct rtl_priv *rtlpriv = rtl_priv(hw); struct rtl_phy *rtlphy = &(rtlpriv->phy); struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw)); - bool rtstatus = true; + bool rtstatus; rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE, "==>\n"); rtstatus = _rtl92d_phy_config_bb_with_headerfile(hw, @@ -887,7 +887,7 @@ static void _rtl92d_ccxpower_index_check(struct ieee80211_hw *hw, static u8 _rtl92c_phy_get_rightchnlplace(u8 chnl) { - u8 place = chnl; + u8 place; if (chnl > 14) { for (place = 14; place < sizeof(channel5g); place++) {