rtlwifi: Convert RT_ASSERT macro to use ##__VA_ARGS__

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

Remove unnecessary RT_ASSERT parentheses.
Align arguments.
Coalesce formats.
Remove unnecessary __func__ use as the macro uses it.

$ size drivers/net/wireless/rtlwifi/built-in.o*
   text	   data	    bss	    dec	    hex	filename
 588901	  55333	 127216	 771450	  bc57a	drivers/net/wireless/rtlwifi/built-in.o.new
 590002	  55333	 127560	 772895	  bcb1f	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>

3 files changed, 6 insertions, 5 deletions

diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c b/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
index de1542f14856..ae38bc52a716 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
@@ -1984,8 +1984,9 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                                                 u4b_ac_param);
                                 break;
                         default:
-                                RT_ASSERT(false, ("SetHwReg8185(): invalid"
-                                          " aci: %d !\n", e_aci));
+                                RT_ASSERT(false,
+                                          "SetHwReg8185(): invalid aci: %d !\n",
+                                          e_aci);
                                 break;
                         }
                         if (rtlusb->acm_method != eAcmWay2_SW)
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c b/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c
index 9f09844d7d50..943f3d49d1f2 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c
@@ -428,7 +428,7 @@ void rtl92c_set_qos(struct ieee80211_hw *hw, int aci)
                 rtl_write_dword(rtlpriv, REG_EDCA_VO_PARAM, u4b_ac_param);
                 break;
         default:
-                RT_ASSERT(false, ("invalid aci: %d !\n", aci));
+                RT_ASSERT(false, "invalid aci: %d !\n", aci);
                 break;
         }
 }
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c b/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
index b875af75b893..aca0fd5d1165 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
@@ -244,8 +244,8 @@ u16 rtl8192cu_mq_to_hwq(__le16 fc, u16 mac80211_queue_index)
                 break;
         default:
                 hw_queue_index = RTL_TXQ_BE;
-                RT_ASSERT(false, ("QSLT_BE queue, skb_queue:%d\n",
-                          mac80211_queue_index));
+                RT_ASSERT(false, "QSLT_BE queue, skb_queue:%d\n",
+                          mac80211_queue_index);
                 break;
         }
 out: