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>

2 files changed, 71 insertions, 80 deletions

diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
index 4aa228fe96e9..2d01673a2087 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
@@ -1362,25 +1362,24 @@ static void _rtl92ce_read_txpower_info_from_hwpg(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++) {
                 for (i = 0; i < 14; i++) {
@@ -1411,11 +1410,11 @@ static void _rtl92ce_read_txpower_info_from_hwpg(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]);
                 }
         }
 
@@ -1452,13 +1451,13 @@ static void _rtl92ce_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
                         }
 
                         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]);
                 }
         }
 
@@ -1497,27 +1496,27 @@ static void _rtl92ce_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
 
         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]);
 
         if (!autoload_fail)
                 rtlefuse->eeprom_regulatory = (hwinfo[RF_OPTION1] & 0x7);
         else
                 rtlefuse->eeprom_regulatory = 0;
         RTPRINT(rtlpriv, FINIT, INIT_TxPower,
-                ("eeprom_regulatory = 0x%x\n", rtlefuse->eeprom_regulatory));
+                "eeprom_regulatory = 0x%x\n", rtlefuse->eeprom_regulatory);
 
         if (!autoload_fail) {
                 rtlefuse->eeprom_tssi[RF90_PATH_A] = hwinfo[EEPROM_TSSI_A];
@@ -1526,10 +1525,9 @@ static void _rtl92ce_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
                 rtlefuse->eeprom_tssi[RF90_PATH_A] = EEPROM_DEFAULT_TSSI;
                 rtlefuse->eeprom_tssi[RF90_PATH_B] = EEPROM_DEFAULT_TSSI;
         }
-        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]);
 
         if (!autoload_fail)
                 tempval = hwinfo[EEPROM_THERMAL_METER];
@@ -1542,7 +1540,7 @@ static void _rtl92ce_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
 
         rtlefuse->thermalmeter[0] = rtlefuse->eeprom_thermalmeter;
         RTPRINT(rtlpriv, FINIT, INIT_TxPower,
-                ("thermalmeter = 0x%x\n", rtlefuse->eeprom_thermalmeter));
+                "thermalmeter = 0x%x\n", rtlefuse->eeprom_thermalmeter);
 }
 
 static void _rtl92ce_read_adapter_info(struct ieee80211_hw *hw)
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/rf.c b/drivers/net/wireless/rtlwifi/rtl8192ce/rf.c
index 3ba1a4feeb3f..5ef960499a43 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/rf.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/rf.c
@@ -123,8 +123,8 @@ void rtl92ce_phy_rf6052_set_cck_txpower(struct ieee80211_hw *hw,
         rtl_set_bbreg(hw, RTXAGC_A_CCK1_MCS32, MASKBYTE1, tmpval);
 
         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                ("CCK PWR 1M (rf-A) = 0x%x (reg 0x%x)\n", tmpval,
-                 RTXAGC_A_CCK1_MCS32));
+                "CCK PWR 1M (rf-A) = 0x%x (reg 0x%x)\n",
+                tmpval, RTXAGC_A_CCK1_MCS32);
 
         tmpval = tx_agc[RF90_PATH_A] >> 8;
 
@@ -133,22 +133,22 @@ void rtl92ce_phy_rf6052_set_cck_txpower(struct ieee80211_hw *hw,
         rtl_set_bbreg(hw, RTXAGC_B_CCK11_A_CCK2_11, 0xffffff00, tmpval);
 
         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                ("CCK PWR 2~11M (rf-A) = 0x%x (reg 0x%x)\n", tmpval,
-                 RTXAGC_B_CCK11_A_CCK2_11));
+                "CCK PWR 2~11M (rf-A) = 0x%x (reg 0x%x)\n",
+                tmpval, RTXAGC_B_CCK11_A_CCK2_11);
 
         tmpval = tx_agc[RF90_PATH_B] >> 24;
         rtl_set_bbreg(hw, RTXAGC_B_CCK11_A_CCK2_11, MASKBYTE0, tmpval);
 
         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                ("CCK PWR 11M (rf-B) = 0x%x (reg 0x%x)\n", tmpval,
-                 RTXAGC_B_CCK11_A_CCK2_11));
+                "CCK PWR 11M (rf-B) = 0x%x (reg 0x%x)\n",
+                tmpval, RTXAGC_B_CCK11_A_CCK2_11);
 
         tmpval = tx_agc[RF90_PATH_B] & 0x00ffffff;
         rtl_set_bbreg(hw, RTXAGC_B_CCK1_55_MCS32, 0xffffff00, tmpval);
 
         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                ("CCK PWR 1~5.5M (rf-B) = 0x%x (reg 0x%x)\n", tmpval,
-                 RTXAGC_B_CCK1_55_MCS32));
+                "CCK PWR 1~5.5M (rf-B) = 0x%x (reg 0x%x)\n",
+                tmpval, RTXAGC_B_CCK1_55_MCS32);
 }
 
 static void rtl92c_phy_get_power_base(struct ieee80211_hw *hw,
@@ -171,8 +171,8 @@ static void rtl92c_phy_get_power_base(struct ieee80211_hw *hw,
                     (powerBase0 << 8) | powerBase0;
                 *(ofdmbase + i) = powerBase0;
                 RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                        (" [OFDM power base index rf(%c) = 0x%x]\n",
-                         ((i == 0) ? 'A' : 'B'), *(ofdmbase + i)));
+                        " [OFDM power base index rf(%c) = 0x%x]\n",
+                        i == 0 ? 'A' : 'B', *(ofdmbase + i));
         }
 
         for (i = 0; i < 2; i++) {
@@ -187,8 +187,8 @@ static void rtl92c_phy_get_power_base(struct ieee80211_hw *hw,
                 *(mcsbase + i) = powerBase1;
 
                 RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                        (" [MCS power base index rf(%c) = 0x%x]\n",
-                         ((i == 0) ? 'A' : 'B'), *(mcsbase + i)));
+                        " [MCS power base index rf(%c) = 0x%x]\n",
+                        i == 0 ? 'A' : 'B', *(mcsbase + i));
         }
 }
 
@@ -215,9 +215,8 @@ static void _rtl92c_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw,
                             + ((index < 2) ? powerBase0[rf] : powerBase1[rf]);
 
                         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                                ("RTK better performance, "
-                                 "writeVal(%c) = 0x%x\n",
-                                 ((rf == 0) ? 'A' : 'B'), writeVal));
+                                "RTK better performance, writeVal(%c) = 0x%x\n",
+                                rf == 0 ? 'A' : 'B', writeVal);
                         break;
                 case 1:
                         if (rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20_40) {
@@ -225,9 +224,8 @@ static void _rtl92c_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw,
                                             powerBase1[rf]);
 
                                 RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                                        ("Realtek regulatory, 40MHz, "
-                                         "writeVal(%c) = 0x%x\n",
-                                         ((rf == 0) ? 'A' : 'B'), writeVal));
+                                        "Realtek regulatory, 40MHz, writeVal(%c) = 0x%x\n",
+                                        rf == 0 ? 'A' : 'B', writeVal);
                         } else {
                                 if (rtlphy->pwrgroup_cnt == 1)
                                         chnlgroup = 0;
@@ -249,9 +247,8 @@ static void _rtl92c_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw,
                                                               powerBase1[rf]);
 
                                 RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                                        ("Realtek regulatory, 20MHz, "
-                                         "writeVal(%c) = 0x%x\n",
-                                         ((rf == 0) ? 'A' : 'B'), writeVal));
+                                        "Realtek regulatory, 20MHz, writeVal(%c) = 0x%x\n",
+                                        rf == 0 ? 'A' : 'B', writeVal);
                         }
                         break;
                 case 2:
@@ -259,27 +256,24 @@ static void _rtl92c_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw,
                             ((index < 2) ? powerBase0[rf] : powerBase1[rf]);
 
                         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                                ("Better regulatory, "
-                                 "writeVal(%c) = 0x%x\n",
-                                 ((rf == 0) ? 'A' : 'B'), writeVal));
+                                "Better regulatory, writeVal(%c) = 0x%x\n",
+                                rf == 0 ? 'A' : 'B', writeVal);
                         break;
                 case 3:
                         chnlgroup = 0;
 
                         if (rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20_40) {
                                 RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                                        ("customer's limit, 40MHz "
-                                         "rf(%c) = 0x%x\n",
-                                         ((rf == 0) ? 'A' : 'B'),
-                                         rtlefuse->pwrgroup_ht40[rf][channel -
-                                                                     1]));
+                                        "customer's limit, 40MHz rf(%c) = 0x%x\n",
+                                        rf == 0 ? 'A' : 'B',
+                                        rtlefuse->pwrgroup_ht40[rf][channel -
+                                                                    1]);
                         } else {
                                 RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                                        ("customer's limit, 20MHz "
-                                         "rf(%c) = 0x%x\n",
-                                         ((rf == 0) ? 'A' : 'B'),
-                                         rtlefuse->pwrgroup_ht20[rf][channel -
-                                                                     1]));
+                                        "customer's limit, 20MHz rf(%c) = 0x%x\n",
+                                        rf == 0 ? 'A' : 'B',
+                                        rtlefuse->pwrgroup_ht20[rf][channel -
+                                                                    1]);
                         }
                         for (i = 0; i < 4; i++) {
                                 pwr_diff_limit[i] =
@@ -311,15 +305,15 @@ static void _rtl92c_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw,
                             (pwr_diff_limit[1] << 8) | (pwr_diff_limit[0]);
 
                         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                                ("Customer's limit rf(%c) = 0x%x\n",
-                                 ((rf == 0) ? 'A' : 'B'), customer_limit));
+                                "Customer's limit rf(%c) = 0x%x\n",
+                                rf == 0 ? 'A' : 'B', customer_limit);
 
                         writeVal = customer_limit +
                             ((index < 2) ? powerBase0[rf] : powerBase1[rf]);
 
                         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                                ("Customer, writeVal rf(%c)= 0x%x\n",
-                                 ((rf == 0) ? 'A' : 'B'), writeVal));
+                                "Customer, writeVal rf(%c)= 0x%x\n",
+                                rf == 0 ? 'A' : 'B', writeVal);
                         break;
                 default:
                         chnlgroup = 0;
@@ -329,9 +323,8 @@ static void _rtl92c_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw,
                             + ((index < 2) ? powerBase0[rf] : powerBase1[rf]);
 
                         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                                ("RTK better performance, writeVal "
-                                 "rf(%c) = 0x%x\n",
-                                 ((rf == 0) ? 'A' : 'B'), writeVal));
+                                "RTK better performance, writeVal rf(%c) = 0x%x\n",
+                                rf == 0 ? 'A' : 'B', writeVal);
                         break;
                 }
 
@@ -383,7 +376,7 @@ static void _rtl92c_write_ofdm_power_reg(struct ieee80211_hw *hw,
                 rtl_set_bbreg(hw, regoffset, MASKDWORD, writeVal);
 
                 RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                        ("Set 0x%x = %08x\n", regoffset, writeVal));
+                        "Set 0x%x = %08x\n", regoffset, writeVal);
 
                 if (((get_rf_type(rtlphy) == RF_2T2R) &&
                      (regoffset == RTXAGC_A_MCS15_MCS12 ||