rtlwifi: Convert RTPRINT macro to use ##__VA_ARGS__

Consolidate printks to avoid possible message interleaving
and reduce the object size.

Remove unnecessary RTPRINT parentheses.
Coalesce formats.
Align arguments.

$ size drivers/net/wireless/rtlwifi/built-in.o*
   text	   data	    bss	    dec	    hex	filename
 590002	  55333	 127560	 772895	  bcb1f	drivers/net/wireless/rtlwifi/built-in.o.new
 594841	  55333	 129680	 779854	  be64e	drivers/net/wireless/rtlwifi/built-in.o.old

Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 43 insertions, 42 deletions

diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/hw.c b/drivers/net/wireless/rtlwifi/rtl8192se/hw.c
index dffcafe01a39..acab8781cc7e 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/hw.c
@@ -1704,23 +1704,24 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw)
         for (rf_path = 0; rf_path < 2; rf_path++)
                 for (i = 0; i < 3; i++)
                         RTPRINT(rtlpriv, FINIT, INIT_EEPROM,
-                                ("RF(%d) EEPROM CCK Area(%d) = 0x%x\n", rf_path,
-                                i, rtlefuse->eeprom_chnlarea_txpwr_cck
-                                        [rf_path][i]));
+                                "RF(%d) EEPROM CCK Area(%d) = 0x%x\n",
+                                rf_path, i,
+                                rtlefuse->eeprom_chnlarea_txpwr_cck
+                                [rf_path][i]);
         for (rf_path = 0; rf_path < 2; rf_path++)
                 for (i = 0; i < 3; i++)
                         RTPRINT(rtlpriv, FINIT, INIT_EEPROM,
-                                ("RF(%d) EEPROM HT40 1S Area(%d) = 0x%x\n",
-                                 rf_path, i,
-                                 rtlefuse->eeprom_chnlarea_txpwr_ht40_1s
-                                                [rf_path][i]));
+                                "RF(%d) EEPROM HT40 1S Area(%d) = 0x%x\n",
+                                rf_path, i,
+                                rtlefuse->eeprom_chnlarea_txpwr_ht40_1s
+                                [rf_path][i]);
         for (rf_path = 0; rf_path < 2; rf_path++)
                 for (i = 0; i < 3; i++)
                         RTPRINT(rtlpriv, FINIT, INIT_EEPROM,
-                                ("RF(%d) EEPROM HT40 2S Diff Area(%d) = 0x%x\n",
-                                 rf_path, i,
-                                 rtlefuse->eeprom_chnlarea_txpwr_ht40_2sdiif
-                                        [rf_path][i]));
+                                "RF(%d) EEPROM HT40 2S Diff Area(%d) = 0x%x\n",
+                                rf_path, i,
+                                rtlefuse->eeprom_chnlarea_txpwr_ht40_2sdiif
+                                [rf_path][i]);
 
         for (rf_path = 0; rf_path < 2; rf_path++) {
 
@@ -1751,11 +1752,11 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw)
 
                 for (i = 0; i < 14; i++) {
                         RTPRINT(rtlpriv, FINIT, INIT_TxPower,
-                                ("RF(%d)-Ch(%d) [CCK / HT40_1S / HT40_2S] = "
-                                 "[0x%x / 0x%x / 0x%x]\n", rf_path, i,
-                                 rtlefuse->txpwrlevel_cck[rf_path][i],
-                                 rtlefuse->txpwrlevel_ht40_1s[rf_path][i],
-                                 rtlefuse->txpwrlevel_ht40_2s[rf_path][i]));
+                                "RF(%d)-Ch(%d) [CCK / HT40_1S / HT40_2S] = [0x%x / 0x%x / 0x%x]\n",
+                                rf_path, i,
+                                rtlefuse->txpwrlevel_cck[rf_path][i],
+                                rtlefuse->txpwrlevel_ht40_1s[rf_path][i],
+                                rtlefuse->txpwrlevel_ht40_2s[rf_path][i]);
                 }
         }
 
@@ -1788,13 +1789,13 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw)
                                 0xf0) >> 4);
 
                         RTPRINT(rtlpriv, FINIT, INIT_TxPower,
-                                ("RF-%d pwrgroup_ht20[%d] = 0x%x\n",
-                                 rf_path, i,
-                                 rtlefuse->pwrgroup_ht20[rf_path][i]));
+                                "RF-%d pwrgroup_ht20[%d] = 0x%x\n",
+                                rf_path, i,
+                                rtlefuse->pwrgroup_ht20[rf_path][i]);
                         RTPRINT(rtlpriv, FINIT, INIT_TxPower,
-                                ("RF-%d pwrgroup_ht40[%d] = 0x%x\n",
-                                 rf_path, i,
-                                 rtlefuse->pwrgroup_ht40[rf_path][i]));
+                                "RF-%d pwrgroup_ht40[%d] = 0x%x\n",
+                                rf_path, i,
+                                rtlefuse->pwrgroup_ht40[rf_path][i]);
                         }
         }
 
@@ -1849,27 +1850,27 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw)
                                  (hwinfo[EEPROM_REGULATORY] & 0x1);
         }
         RTPRINT(rtlpriv, FINIT, INIT_TxPower,
-                ("eeprom_regulatory = 0x%x\n", rtlefuse->eeprom_regulatory));
+                "eeprom_regulatory = 0x%x\n", rtlefuse->eeprom_regulatory);
 
         for (i = 0; i < 14; i++)
                 RTPRINT(rtlpriv, FINIT, INIT_TxPower,
-                        ("RF-A Ht20 to HT40 Diff[%d] = 0x%x\n", i,
-                         rtlefuse->txpwr_ht20diff[RF90_PATH_A][i]));
+                        "RF-A Ht20 to HT40 Diff[%d] = 0x%x\n",
+                        i, rtlefuse->txpwr_ht20diff[RF90_PATH_A][i]);
         for (i = 0; i < 14; i++)
                 RTPRINT(rtlpriv, FINIT, INIT_TxPower,
-                        ("RF-A Legacy to Ht40 Diff[%d] = 0x%x\n", i,
-                         rtlefuse->txpwr_legacyhtdiff[RF90_PATH_A][i]));
+                        "RF-A Legacy to Ht40 Diff[%d] = 0x%x\n",
+                        i, rtlefuse->txpwr_legacyhtdiff[RF90_PATH_A][i]);
         for (i = 0; i < 14; i++)
                 RTPRINT(rtlpriv, FINIT, INIT_TxPower,
-                        ("RF-B Ht20 to HT40 Diff[%d] = 0x%x\n", i,
-                         rtlefuse->txpwr_ht20diff[RF90_PATH_B][i]));
+                        "RF-B Ht20 to HT40 Diff[%d] = 0x%x\n",
+                        i, rtlefuse->txpwr_ht20diff[RF90_PATH_B][i]);
         for (i = 0; i < 14; i++)
                 RTPRINT(rtlpriv, FINIT, INIT_TxPower,
-                        ("RF-B Legacy to HT40 Diff[%d] = 0x%x\n", i,
-                         rtlefuse->txpwr_legacyhtdiff[RF90_PATH_B][i]));
+                        "RF-B Legacy to HT40 Diff[%d] = 0x%x\n",
+                        i, rtlefuse->txpwr_legacyhtdiff[RF90_PATH_B][i]);
 
-        RTPRINT(rtlpriv, FINIT, INIT_TxPower, ("TxPwrSafetyFlag = %d\n",
-                rtlefuse->txpwr_safetyflag));
+        RTPRINT(rtlpriv, FINIT, INIT_TxPower,
+                "TxPwrSafetyFlag = %d\n", rtlefuse->txpwr_safetyflag);
 
         /* Read RF-indication and Tx Power gain
          * index diff of legacy to HT OFDM rate. */
@@ -1878,8 +1879,8 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw)
         rtlefuse->legacy_httxpowerdiff =
                 rtlefuse->txpwr_legacyhtdiff[RF90_PATH_A][0];
 
-        RTPRINT(rtlpriv, FINIT, INIT_TxPower, ("TxPowerDiff = %#x\n",
-                rtlefuse->eeprom_txpowerdiff));
+        RTPRINT(rtlpriv, FINIT, INIT_TxPower,
+                "TxPowerDiff = %#x\n", rtlefuse->eeprom_txpowerdiff);
 
         /* Get TSSI value for each path. */
         usvalue = *(u16 *)&hwinfo[EEPROM_TSSI_A];
@@ -1887,16 +1888,16 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw)
         usvalue = *(u8 *)&hwinfo[EEPROM_TSSI_B];
         rtlefuse->eeprom_tssi[RF90_PATH_B] = (u8)(usvalue & 0xff);
 
-        RTPRINT(rtlpriv, FINIT, INIT_TxPower, ("TSSI_A = 0x%x, TSSI_B = 0x%x\n",
-                 rtlefuse->eeprom_tssi[RF90_PATH_A],
-                 rtlefuse->eeprom_tssi[RF90_PATH_B]));
+        RTPRINT(rtlpriv, FINIT, INIT_TxPower, "TSSI_A = 0x%x, TSSI_B = 0x%x\n",
+                rtlefuse->eeprom_tssi[RF90_PATH_A],
+                rtlefuse->eeprom_tssi[RF90_PATH_B]);
 
         /* Read antenna tx power offset of B/C/D to A  from EEPROM */
         /* and read ThermalMeter from EEPROM */
         tempval = *(u8 *)&hwinfo[EEPROM_THERMALMETER];
         rtlefuse->eeprom_thermalmeter = tempval;
-        RTPRINT(rtlpriv, FINIT, INIT_TxPower, ("thermalmeter = 0x%x\n",
-                rtlefuse->eeprom_thermalmeter));
+        RTPRINT(rtlpriv, FINIT, INIT_TxPower,
+                "thermalmeter = 0x%x\n", rtlefuse->eeprom_thermalmeter);
 
         /* ThermalMeter, BIT(0)~3 for RFIC1, BIT(4)~7 for RFIC2 */
         rtlefuse->thermalmeter[0] = (rtlefuse->eeprom_thermalmeter & 0x1f);
@@ -1912,8 +1913,8 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw)
         /* Version ID, Channel plan */
         rtlefuse->eeprom_channelplan = *(u8 *)&hwinfo[EEPROM_CHANNELPLAN];
         rtlefuse->txpwr_fromeprom = true;
-        RTPRINT(rtlpriv, FINIT, INIT_TxPower, ("EEPROM ChannelPlan = 0x%4x\n",
-                rtlefuse->eeprom_channelplan));
+        RTPRINT(rtlpriv, FINIT, INIT_TxPower,
+                "EEPROM ChannelPlan = 0x%4x\n", rtlefuse->eeprom_channelplan);
 
         /* Read Customer ID or Board Type!!! */
         tempval = *(u8 *)&hwinfo[EEPROM_BOARDTYPE];