* [PATCH 1/2] rtlwifi: rtl8192de: Remove redundant variable initializations
@ 2021-07-31 12:40 Colin King
2021-07-31 12:40 ` [PATCH 2/2] rtlwifi: rtl8192de: make arrays static const, makes object smaller Colin King
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Colin King @ 2021-07-31 12:40 UTC (permalink / raw)
To: Ping-Ke Shih, Kalle Valo, David S . Miller, Jakub Kicinski,
linux-wireless, netdev
Cc: kernel-janitors, linux-kernel
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
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/2] rtlwifi: rtl8192de: make arrays static const, makes object smaller
2021-07-31 12:40 [PATCH 1/2] rtlwifi: rtl8192de: Remove redundant variable initializations Colin King
@ 2021-07-31 12:40 ` Colin King
2021-08-02 8:04 ` Pkshih
2021-08-02 8:35 ` Joe Perches
2021-08-02 8:04 ` [PATCH 1/2] rtlwifi: rtl8192de: Remove redundant variable initializations Pkshih
2021-08-02 8:35 ` Joe Perches
2 siblings, 2 replies; 8+ messages in thread
From: Colin King @ 2021-07-31 12:40 UTC (permalink / raw)
To: Ping-Ke Shih, Kalle Valo, David S . Miller, Jakub Kicinski,
linux-wireless, netdev
Cc: kernel-janitors, linux-kernel
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.
Before:
text data bss dec hex filename
128211 44250 1024 173485 2a5ad ../realtek/rtlwifi/rtl8192de/phy.o
After:
text data bss dec hex filename
127199 44410 1024 172633 2a259 ../realtek/rtlwifi/rtl8192de/phy.o
(gcc version 10.2.0)
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 4eaa40d73baf..79956254f798 100644
--- 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,
--
2.31.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 2/2] rtlwifi: rtl8192de: make arrays static const, makes object smaller
2021-07-31 12:40 ` [PATCH 2/2] rtlwifi: rtl8192de: make arrays static const, makes object smaller Colin King
@ 2021-08-02 8:04 ` Pkshih
2021-08-02 8:35 ` Joe Perches
1 sibling, 0 replies; 8+ messages in thread
From: Pkshih @ 2021-08-02 8:04 UTC (permalink / raw)
To: linux-wireless, kuba, colin.king, kvalo, netdev, davem
Cc: kernel-janitors, linux-kernel
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.
>
> Before:
> text data bss dec hex filename
> 128211 44250 1024 173485 2a5ad ../realtek/rtlwifi/rt
> l8192de/phy.o
>
> After:
> text data bss dec hex filename
> 127199 44410 1024 172633 2a259 ../realtek/rtlwifi/rt
> l8192de/phy.o
>
> (gcc version 10.2.0)
>
> 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 4eaa40d73baf..79956254f798 100644
> --- 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,
> --
> 2.31.1
>
> ------Please consider the environment before printing this e-mail.
Acked-by: Ping-Ke Shih <pkshih@realtek.com>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] rtlwifi: rtl8192de: Remove redundant variable initializations
2021-07-31 12:40 [PATCH 1/2] rtlwifi: rtl8192de: Remove redundant variable initializations Colin King
2021-07-31 12:40 ` [PATCH 2/2] rtlwifi: rtl8192de: make arrays static const, makes object smaller Colin King
@ 2021-08-02 8:04 ` Pkshih
2021-08-02 8:35 ` Joe Perches
2 siblings, 0 replies; 8+ messages in thread
From: Pkshih @ 2021-08-02 8:04 UTC (permalink / raw)
To: linux-wireless, kuba, colin.king, kvalo, netdev, davem
Cc: kernel-janitors, linux-kernel
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>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] rtlwifi: rtl8192de: Remove redundant variable initializations
2021-07-31 12:40 [PATCH 1/2] rtlwifi: rtl8192de: Remove redundant variable initializations Colin King
2021-07-31 12:40 ` [PATCH 2/2] rtlwifi: rtl8192de: make arrays static const, makes object smaller Colin King
2021-08-02 8:04 ` [PATCH 1/2] rtlwifi: rtl8192de: Remove redundant variable initializations Pkshih
@ 2021-08-02 8:35 ` Joe Perches
2021-08-03 14:03 ` Colin Ian King
2 siblings, 1 reply; 8+ messages in thread
From: Joe Perches @ 2021-08-02 8:35 UTC (permalink / raw)
To: Colin King, Ping-Ke Shih, Kalle Valo, David S . Miller,
Jakub Kicinski, linux-wireless, netdev
Cc: kernel-janitors, linux-kernel
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++) {
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 2/2] rtlwifi: rtl8192de: make arrays static const, makes object smaller
2021-07-31 12:40 ` [PATCH 2/2] rtlwifi: rtl8192de: make arrays static const, makes object smaller Colin King
2021-08-02 8:04 ` Pkshih
@ 2021-08-02 8:35 ` Joe Perches
2021-08-03 14:03 ` Colin Ian King
1 sibling, 1 reply; 8+ messages in thread
From: Joe Perches @ 2021-08-02 8:35 UTC (permalink / raw)
To: Colin King, Ping-Ke Shih, Kalle Valo, David S . Miller,
Jakub Kicinski, linux-wireless, netdev
Cc: kernel-janitors, linux-kernel
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.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 2/2] rtlwifi: rtl8192de: make arrays static const, makes object smaller
2021-08-02 8:35 ` Joe Perches
@ 2021-08-03 14:03 ` Colin Ian King
0 siblings, 0 replies; 8+ messages in thread
From: Colin Ian King @ 2021-08-03 14:03 UTC (permalink / raw)
To: Joe Perches, Ping-Ke Shih, Kalle Valo, David S . Miller,
Jakub Kicinski, linux-wireless, netdev
Cc: kernel-janitors, linux-kernel
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>
>>
>> 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.
>
Good spot, will send a V2.
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] rtlwifi: rtl8192de: Remove redundant variable initializations
2021-08-02 8:35 ` Joe Perches
@ 2021-08-03 14:03 ` Colin Ian King
0 siblings, 0 replies; 8+ messages in thread
From: Colin Ian King @ 2021-08-03 14:03 UTC (permalink / raw)
To: Joe Perches, Ping-Ke Shih, Kalle Valo, David S . Miller,
Jakub Kicinski, linux-wireless, netdev
Cc: kernel-janitors, linux-kernel
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.
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2021-08-03 14:03 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-31 12:40 [PATCH 1/2] rtlwifi: rtl8192de: Remove redundant variable initializations Colin King
2021-07-31 12:40 ` [PATCH 2/2] rtlwifi: rtl8192de: make arrays static const, makes object smaller Colin King
2021-08-02 8:04 ` Pkshih
2021-08-02 8:35 ` Joe Perches
2021-08-03 14:03 ` Colin Ian King
2021-08-02 8:04 ` [PATCH 1/2] rtlwifi: rtl8192de: Remove redundant variable initializations Pkshih
2021-08-02 8:35 ` Joe Perches
2021-08-03 14:03 ` Colin Ian King
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).