diff mbox series

[2/2] rtlwifi: rtl8192de: make arrays static const, makes object smaller

Message ID 20210731124044.101927-2-colin.king@canonical.com (mailing list archive)
State Superseded
Delegated to: Netdev Maintainers
Headers show
Series [1/2] rtlwifi: rtl8192de: Remove redundant variable initializations | expand

Checks

Context Check Description
netdev/tree_selection success Not a local patch

Commit Message

Colin King July 31, 2021, 12:40 p.m. UTC
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(-)

Comments

Ping-Ke Shih Aug. 2, 2021, 8:04 a.m. UTC | #1
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>
Joe Perches Aug. 2, 2021, 8:35 a.m. UTC | #2
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.
Colin King Aug. 3, 2021, 2:03 p.m. UTC | #3
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.
>
diff mbox series

Patch

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,