Message ID | 20210731124044.101927-1-colin.king@canonical.com |
---|---|
State | New |
Headers | show |
Series | [1/2] rtlwifi: rtl8192de: Remove redundant variable initializations | expand |
On Sat, 2021-07-31 at 13:40 +0100, Colin King 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> > --- > drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c > b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c > index 76dd881ef9bb..4eaa40d73baf 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, > @@ -1362,7 +1362,7 @@ u8 rtl92d_get_rightchnlplace_for_iqk(u8 chnl) > 132, 134, 136, 138, 140, 149, 151, 153, 155, > 157, 159, 161, 163, 165 > }; > - u8 place = chnl; > + u8 place; > > if (chnl > 14) { > for (place = 14; place < sizeof(channel_all); place++) > { > -- > 2.31.1 > > ------Please consider the environment before printing this e-mail. Acked-by: Ping-Ke Shih <pkshih@realtek.com>
On Sat, 2021-07-31 at 13:40 +0100, Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > Don't populate arrays the stack but instead make them static const > Makes the object code smaller by 852 bytes. [] > diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c [] > @@ -1354,7 +1354,7 @@ static void _rtl92d_phy_switch_rf_setting(struct ieee80211_hw *hw, u8 channel) > > > u8 rtl92d_get_rightchnlplace_for_iqk(u8 chnl) > { > - u8 channel_all[59] = { > + static const u8 channel_all[59] = { > 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, > 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, > 60, 62, 64, 100, 102, 104, 106, 108, 110, 112, > @@ -3220,7 +3220,7 @@ void rtl92d_phy_config_macphymode_info(struct ieee80211_hw *hw) > u8 rtl92d_get_chnlgroup_fromarray(u8 chnl) > { > u8 group; > - u8 channel_info[59] = { > + static const u8 channel_info[59] = { > 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, > 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, > 58, 60, 62, 64, 100, 102, 104, 106, 108, These two arrays (channel_info and channel_all) are identical but laid out differently and could be combined and use a single name.
On 02/08/2021 09:35, Joe Perches wrote: > On Sat, 2021-07-31 at 13:40 +0100, Colin King 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. > > trivia: > >> diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c > [] >> @@ -1362,7 +1362,7 @@ u8 rtl92d_get_rightchnlplace_for_iqk(u8 chnl) >> 132, 134, 136, 138, 140, 149, 151, 153, 155, >> 157, 159, 161, 163, 165 >> }; >> - u8 place = chnl; >> + u8 place; >> >> >> if (chnl > 14) { >> for (place = 14; place < sizeof(channel_all); place++) { > > This line should probably be > > for (place = 14; place < ARRAY_SIZE(channel_all); place++) { > Nice catch, will send a V2.
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c index 76dd881ef9bb..4eaa40d73baf 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, @@ -1362,7 +1362,7 @@ u8 rtl92d_get_rightchnlplace_for_iqk(u8 chnl) 132, 134, 136, 138, 140, 149, 151, 153, 155, 157, 159, 161, 163, 165 }; - u8 place = chnl; + u8 place; if (chnl > 14) { for (place = 14; place < sizeof(channel_all); place++) {