rtl8xxxu: make arrays static, makes object smaller

Don't populate const arrays on the stack but instead make them
static. Makes the object code smaller by 60 bytes.

Before:
   text	   data	    bss	    dec	    hex	filename
  15133	   8768	      0	  23901	   5d5d	realtek/rtl8xxxu/rtl8xxxu_8192e.o
  15209	   6392	      0	  21601	   5461	realtek/rtl8xxxu/rtl8xxxu_8723b.o
 103254	  31202	    576	 135032	  20f78	realtek/rtl8xxxu/rtl8xxxu_core.o

After:
   text	   data	    bss	    dec	    hex	filename
  14861	   9024	      0	  23885	   5d4d	realtek/rtl8xxxu/rtl8xxxu_8192e.o
  14953	   6616	      0	  21569	   5441	realtek/rtl8xxxu/rtl8xxxu_8723b.o
 102986	  31458	    576	 135020	  20f6c	realtek/rtl8xxxu/rtl8xxxu_core.o

(gcc version 9.2.1, amd64)

Signed-off-by: Colin Ian King <colin.king@canonical.com>
Reviewed-by: Chris Chiu <chiu@endlessm.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c
index c747f6a1922d6c7bf41c041efe863864c68a7ec6..9f1f93d04145d83ff29b8e9701d3578324383d39 100644 (file)
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c
@@ -1011,7 +1011,7 @@ static void rtl8192eu_phy_iqcalibrate(struct rtl8xxxu_priv *priv,
        u32 i, val32;
        int path_a_ok, path_b_ok;
        int retry = 2;
-       const u32 adda_regs[RTL8XXXU_ADDA_REGS] = {
+       static const u32 adda_regs[RTL8XXXU_ADDA_REGS] = {
                REG_FPGA0_XCD_SWITCH_CTRL, REG_BLUETOOTH,
                REG_RX_WAIT_CCA, REG_TX_CCK_RFON,
                REG_TX_CCK_BBON, REG_TX_OFDM_RFON,
@@ -1021,11 +1021,11 @@ static void rtl8192eu_phy_iqcalibrate(struct rtl8xxxu_priv *priv,
                REG_RX_TO_RX, REG_STANDBY,
                REG_SLEEP, REG_PMPD_ANAEN
        };
-       const u32 iqk_mac_regs[RTL8XXXU_MAC_REGS] = {
+       static const u32 iqk_mac_regs[RTL8XXXU_MAC_REGS] = {
                REG_TXPAUSE, REG_BEACON_CTRL,
                REG_BEACON_CTRL_1, REG_GPIO_MUXCFG
        };
-       const u32 iqk_bb_regs[RTL8XXXU_BB_REGS] = {
+       static const u32 iqk_bb_regs[RTL8XXXU_BB_REGS] = {
                REG_OFDM0_TRX_PATH_ENABLE, REG_OFDM0_TR_MUX_PAR,
                REG_FPGA0_XCD_RF_SW_CTRL, REG_CONFIG_ANT_A, REG_CONFIG_ANT_B,
                REG_FPGA0_XAB_RF_SW_CTRL, REG_FPGA0_XA_RF_INT_OE,

diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c
index 9ba661b3d7678f15ea8ad6a2464b07acafcac6f4..d15dde388435b6385b035587ad924b18761709d6 100644 (file)
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c
@@ -882,7 +882,7 @@ static void rtl8723bu_phy_iqcalibrate(struct rtl8xxxu_priv *priv,
        u32 i, val32;
        int path_a_ok /*, path_b_ok */;
        int retry = 2;
-       const u32 adda_regs[RTL8XXXU_ADDA_REGS] = {
+       static const u32 adda_regs[RTL8XXXU_ADDA_REGS] = {
                REG_FPGA0_XCD_SWITCH_CTRL, REG_BLUETOOTH,
                REG_RX_WAIT_CCA, REG_TX_CCK_RFON,
                REG_TX_CCK_BBON, REG_TX_OFDM_RFON,
@@ -892,11 +892,11 @@ static void rtl8723bu_phy_iqcalibrate(struct rtl8xxxu_priv *priv,
                REG_RX_TO_RX, REG_STANDBY,
                REG_SLEEP, REG_PMPD_ANAEN
        };
-       const u32 iqk_mac_regs[RTL8XXXU_MAC_REGS] = {
+       static const u32 iqk_mac_regs[RTL8XXXU_MAC_REGS] = {
                REG_TXPAUSE, REG_BEACON_CTRL,
                REG_BEACON_CTRL_1, REG_GPIO_MUXCFG
        };
-       const u32 iqk_bb_regs[RTL8XXXU_BB_REGS] = {
+       static const u32 iqk_bb_regs[RTL8XXXU_BB_REGS] = {
                REG_OFDM0_TRX_PATH_ENABLE, REG_OFDM0_TR_MUX_PAR,
                REG_FPGA0_XCD_RF_SW_CTRL, REG_CONFIG_ANT_A, REG_CONFIG_ANT_B,
                REG_FPGA0_XAB_RF_SW_CTRL, REG_FPGA0_XA_RF_INT_OE,

diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
index 8c47fdf2fdef082e107efef5ff2d8f2166a12115..1e3b71626f1b07d01b594cfc6dfaae56497c1ac1 100644 (file)
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
@@ -3115,7 +3115,7 @@ static void rtl8xxxu_phy_iqcalibrate(struct rtl8xxxu_priv *priv,
        u32 i, val32;
        int path_a_ok, path_b_ok;
        int retry = 2;
-       const u32 adda_regs[RTL8XXXU_ADDA_REGS] = {
+       static const u32 adda_regs[RTL8XXXU_ADDA_REGS] = {
                REG_FPGA0_XCD_SWITCH_CTRL, REG_BLUETOOTH,
                REG_RX_WAIT_CCA, REG_TX_CCK_RFON,
                REG_TX_CCK_BBON, REG_TX_OFDM_RFON,
@@ -3125,11 +3125,11 @@ static void rtl8xxxu_phy_iqcalibrate(struct rtl8xxxu_priv *priv,
                REG_RX_TO_RX, REG_STANDBY,
                REG_SLEEP, REG_PMPD_ANAEN
        };
-       const u32 iqk_mac_regs[RTL8XXXU_MAC_REGS] = {
+       static const u32 iqk_mac_regs[RTL8XXXU_MAC_REGS] = {
                REG_TXPAUSE, REG_BEACON_CTRL,
                REG_BEACON_CTRL_1, REG_GPIO_MUXCFG
        };
-       const u32 iqk_bb_regs[RTL8XXXU_BB_REGS] = {
+       static const u32 iqk_bb_regs[RTL8XXXU_BB_REGS] = {
                REG_OFDM0_TRX_PATH_ENABLE, REG_OFDM0_TR_MUX_PAR,
                REG_FPGA0_XCD_RF_SW_CTRL, REG_CONFIG_ANT_A, REG_CONFIG_ANT_B,
                REG_FPGA0_XAB_RF_SW_CTRL, REG_FPGA0_XA_RF_INT_OE,