rtlwifi: Convert RT_TRACE macro to use ##__VA_ARGS__

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

Remove unnecessary RT_TRACE parentheses.

Miscellaneous typo and grammar fixes.
Add missing newlines to formats.
Remove duplicate KERN_DEBUG prefixes.
Coalesce formats.
Align arguments.

$ size drivers/net/wireless/rtlwifi/built-in.o*
   text    data     bss     dec     hex filename
 594841   55333  129680  779854   be64e drivers/net/wireless/rtlwifi/built-in.o.new
 607022   55333  138720  801075   c3933 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, 12 insertions, 12 deletions

diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/dm.c b/drivers/net/wireless/rtlwifi/rtl8192ce/dm.c
index 2df33e53e15a..6730e683aba3 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/dm.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/dm.c
@@ -54,7 +54,7 @@ void rtl92ce_dm_dynamic_txpower(struct ieee80211_hw *hw)
         if ((mac->link_state < MAC80211_LINKED) &&
             (rtlpriv->dm.entry_min_undecoratedsmoothed_pwdb == 0)) {
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_TRACE,
-                         ("Not connected to any\n"));
+                         "Not connected to any\n");
 
                 rtlpriv->dm.dynamic_txhighpower_lvl = TXHIGHPWRLEVEL_NORMAL;
 
@@ -67,28 +67,28 @@ void rtl92ce_dm_dynamic_txpower(struct ieee80211_hw *hw)
                         undecorated_smoothed_pwdb =
                             rtlpriv->dm.entry_min_undecoratedsmoothed_pwdb;
                         RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                                 ("AP Client PWDB = 0x%lx\n",
-                                  undecorated_smoothed_pwdb));
+                                 "AP Client PWDB = 0x%lx\n",
+                                 undecorated_smoothed_pwdb);
                 } else {
                         undecorated_smoothed_pwdb =
                             rtlpriv->dm.undecorated_smoothed_pwdb;
                         RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                                 ("STA Default Port PWDB = 0x%lx\n",
-                                  undecorated_smoothed_pwdb));
+                                 "STA Default Port PWDB = 0x%lx\n",
+                                 undecorated_smoothed_pwdb);
                 }
         } else {
                 undecorated_smoothed_pwdb =
                     rtlpriv->dm.entry_min_undecoratedsmoothed_pwdb;
 
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                         ("AP Ext Port PWDB = 0x%lx\n",
-                          undecorated_smoothed_pwdb));
+                         "AP Ext Port PWDB = 0x%lx\n",
+                         undecorated_smoothed_pwdb);
         }
 
         if (undecorated_smoothed_pwdb >= TX_POWER_NEAR_FIELD_THRESH_LVL2) {
                 rtlpriv->dm.dynamic_txhighpower_lvl = TXHIGHPWRLEVEL_LEVEL1;
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                         ("TXHIGHPWRLEVEL_LEVEL1 (TxPwr=0x0)\n"));
+                         "TXHIGHPWRLEVEL_LEVEL1 (TxPwr=0x0)\n");
         } else if ((undecorated_smoothed_pwdb <
                     (TX_POWER_NEAR_FIELD_THRESH_LVL2 - 3)) &&
                    (undecorated_smoothed_pwdb >=
@@ -96,18 +96,18 @@ void rtl92ce_dm_dynamic_txpower(struct ieee80211_hw *hw)
 
                 rtlpriv->dm.dynamic_txhighpower_lvl = TXHIGHPWRLEVEL_LEVEL1;
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                         ("TXHIGHPWRLEVEL_LEVEL1 (TxPwr=0x10)\n"));
+                         "TXHIGHPWRLEVEL_LEVEL1 (TxPwr=0x10)\n");
         } else if (undecorated_smoothed_pwdb <
                    (TX_POWER_NEAR_FIELD_THRESH_LVL1 - 5)) {
                 rtlpriv->dm.dynamic_txhighpower_lvl = TXHIGHPWRLEVEL_NORMAL;
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                         ("TXHIGHPWRLEVEL_NORMAL\n"));
+                         "TXHIGHPWRLEVEL_NORMAL\n");
         }
 
         if ((rtlpriv->dm.dynamic_txhighpower_lvl != rtlpriv->dm.last_dtp_lvl)) {
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                         ("PHY_SetTxPowerLevel8192S() Channel = %d\n",
-                          rtlphy->current_channel));
+                         "PHY_SetTxPowerLevel8192S() Channel = %d\n",
+                         rtlphy->current_channel);
                 rtl92c_phy_set_txpower_level(hw, rtlphy->current_channel);
         }