staging: rtl8723au: Update RT_TRACE macro and uses

Create an rt_trace function using %pV to reduce overall code size.
Update the macro uses to remove unnecessary and now harmful parentheses.

Miscellanea around these changes:

o Coalesce formats
o Realign arguments
o Remove commented-out RT_TRACE uses
o Spelling fixes in formats
o Add missing newlines to formats
o Remove multiple newlines from formats
o Neaten formats where noticed
o Use %pM in one instance

Reduces code size ~20KB

Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723au/core/rtw_cmd.c b/drivers/staging/rtl8723au/core/rtw_cmd.c
index f6b99d8..46aea16 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_cmd.c
+++ b/drivers/staging/rtl8723au/core/rtw_cmd.c
@@ -299,9 +299,8 @@ post_process:
                pcmd_callback = rtw_cmd_callback[pcmd->cmdcode].callback;
                if (!pcmd_callback) {
                        RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_,
-                                ("mlme_cmd_hdl(): pcmd_callback = 0x%p, "
-                                 "cmdcode = 0x%x\n",
-                                 pcmd_callback, pcmd->cmdcode));
+                                "mlme_cmd_hdl(): pcmd_callback = 0x%p, cmdcode = 0x%x\n",
+                                pcmd_callback, pcmd->cmdcode);
                        rtw_free_cmd_obj23a(pcmd);
                } else {
                        /* need consider that free cmd_obj in
@@ -310,8 +309,8 @@ post_process:
                }
        } else {
                RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_,
-                        ("%s: cmdcode = 0x%x callback not defined!\n",
-                         __func__, pcmd->cmdcode));
+                        "%s: cmdcode = 0x%x callback not defined!\n",
+                        __func__, pcmd->cmdcode);
                rtw_free_cmd_obj23a(pcmd);
        }
 }
@@ -343,7 +342,7 @@ int rtw_sitesurvey_cmd23a(struct rtw_adapter *padapter,
        rtw_free_network_queue23a(padapter);
 
        RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_,
-                ("%s: flush network queue\n", __func__));
+                "%s: flush network queue\n", __func__);
 
        init_h2fwcmd_w_parm_no_rsp(ph2c, psurveyPara,
                                   GEN_CMD_CODE(_SiteSurvey));
@@ -412,12 +411,12 @@ int rtw_createbss_cmd23a(struct rtw_adapter  *padapter)
 
        if (pmlmepriv->assoc_ssid.ssid_len == 0) {
                RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_,
-                        (" createbss for Any SSid:%s\n",
-                         pmlmepriv->assoc_ssid.ssid));
+                        "createbss for Any SSid:%s\n",
+                        pmlmepriv->assoc_ssid.ssid);
        } else {
                RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_,
-                        (" createbss for SSid:%s\n",
-                         pmlmepriv->assoc_ssid.ssid));
+                        "createbss for SSid:%s\n",
+                        pmlmepriv->assoc_ssid.ssid);
        }
 
        pcmd = kzalloc(sizeof(struct cmd_obj), GFP_ATOMIC);
@@ -460,19 +459,18 @@ int rtw_joinbss_cmd23a(struct rtw_adapter *padapter,
 
        if (pmlmepriv->assoc_ssid.ssid_len == 0) {
                RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_,
-                        ("+Join cmd: Any SSid\n"));
+                        "+Join cmd: Any SSid\n");
        } else {
                RT_TRACE(_module_rtl871x_cmd_c_, _drv_notice_,
-                        ("+Join cmd: SSid =[%s]\n",
-                         pmlmepriv->assoc_ssid.ssid));
+                        "+Join cmd: SSid =[%s]\n",
+                        pmlmepriv->assoc_ssid.ssid);
        }
 
        pcmd = kzalloc(sizeof(struct cmd_obj), GFP_ATOMIC);
        if (!pcmd) {
                res = _FAIL;
                RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_,
-                        ("rtw_joinbss_cmd23a: memory allocate for cmd_obj "
-                         "fail!!!\n"));
+                        "rtw_joinbss_cmd23a: memory allocate for cmd_obj fail!!!\n");
                goto exit;
        }
 
@@ -497,7 +495,7 @@ int rtw_joinbss_cmd23a(struct rtw_adapter *padapter,
                res = _FAIL;
 
                RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_,
-                        ("rtw_joinbss_cmd23a :psecnetwork == NULL!!!\n"));
+                        "rtw_joinbss_cmd23a :psecnetwork == NULL!!!\n");
 
                goto exit;
        }
@@ -599,7 +597,7 @@ int rtw_disassoc_cmd23a(struct rtw_adapter *padapter, u32 deauth_timeout_ms,
        int res = _SUCCESS;
 
        RT_TRACE(_module_rtl871x_cmd_c_, _drv_notice_,
-                ("+rtw_disassoc_cmd23a\n"));
+                "+rtw_disassoc_cmd23a\n");
 
        /* prepare cmd parameter */
        param = kzalloc(sizeof(*param), GFP_ATOMIC);
@@ -1291,8 +1289,7 @@ void rtw_survey_cmd_callback23a(struct rtw_adapter *padapter,
                mod_timer(&pmlmepriv->scan_to_timer,
                          jiffies + msecs_to_jiffies(1));
                RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_,
-                        ("\n ********Error: MgntActrtw_set_802_11_bssid23a_"
-                         "LIST_SCAN Fail ************\n\n."));
+                        "********Error: MgntActrtw_set_802_11_bssid23a_LIST_SCAN Fail ************\n");
        }
 
        /*  free cmd */
@@ -1309,7 +1306,7 @@ void rtw_disassoc_cmd23a_callback(struct rtw_adapter *padapter,
                set_fwstate(pmlmepriv, _FW_LINKED);
                spin_unlock_bh(&pmlmepriv->lock);
                RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_,
-                        ("\n ***Error: disconnect_cmd_callback Fail ***\n."));
+                        "***Error: disconnect_cmd_callback Fail ***\n");
                return;
        }
 
@@ -1329,8 +1326,7 @@ void rtw_joinbss_cmd23a_callback(struct rtw_adapter *padapter,
                          jiffies + msecs_to_jiffies(1));
        } else if (pcmd->res != H2C_SUCCESS) {
                RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_,
-                        ("********Error:rtw_select_and_join_from_scanned_"
-                         "queue Wait Sema  Fail ************\n"));
+                        "********Error:rtw_select_and_join_from_scanned_queue Wait Sema  Fail ************\n");
                mod_timer(&pmlmepriv->assoc_timer,
                          jiffies + msecs_to_jiffies(1));
        }
@@ -1349,8 +1345,7 @@ void rtw_createbss_cmd23a_callback(struct rtw_adapter *padapter,
 
        if (pcmd->res != H2C_SUCCESS) {
                RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_,
-                        ("\n ********Error: rtw_createbss_cmd23a_callback  "
-                         "Fail ************\n\n."));
+                        "********Error: rtw_createbss_cmd23a_callback  Fail ************\n");
                mod_timer(&pmlmepriv->assoc_timer,
                          jiffies + msecs_to_jiffies(1));
        }
@@ -1366,8 +1361,7 @@ void rtw_createbss_cmd23a_callback(struct rtw_adapter *padapter,
                                                    GFP_KERNEL);
                        if (!psta) {
                                RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_,
-                                        ("\nCan't alloc sta_info when "
-                                         "createbss_cmd_callback\n"));
+                                        "Can't alloc sta_info when createbss_cmd_callback\n");
                                goto createbss_cmd_fail;
                        }
                }
@@ -1382,8 +1376,7 @@ void rtw_createbss_cmd23a_callback(struct rtw_adapter *padapter,
                        pwlan = rtw_get_oldest_wlan_network23a(&pmlmepriv->scanned_queue);
                        if (!pwlan) {
                                RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_,
-                                        ("\n Error:  can't get pwlan in "
-                                         "rtw23a_joinbss_event_cb\n"));
+                                        "Error:  can't get pwlan in rtw23a_joinbss_event_cb\n");
                                spin_unlock_bh(&pmlmepriv->scanned_queue.lock);
                                goto createbss_cmd_fail;
                        }
@@ -1432,8 +1425,7 @@ void rtw_setstaKey_cmdrsp_callback23a(struct rtw_adapter *padapter,
 
        if (!psta) {
                RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_,
-                        ("\nERROR: rtw_setstaKey_cmdrsp_callback23a => "
-                         "can't get sta_info\n\n"));
+                        "ERROR: rtw_setstaKey_cmdrsp_callback23a => can't get sta_info\n");
                goto exit;
        }
 
@@ -1457,8 +1449,7 @@ void rtw_setassocsta_cmdrsp_callback23a(struct rtw_adapter *padapter,
 
        if (psta == NULL) {
                RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_,
-                        ("\nERROR: setassocsta_cmdrsp_callbac => can't "
-                         "get sta_info\n\n"));
+                        "ERROR: setassocsta_cmdrsp_callbac => can't get sta_info\n");
                goto exit;
        }
 

diff --git a/drivers/staging/rtl8723au/core/rtw_efuse.c b/drivers/staging/rtl8723au/core/rtw_efuse.c
index 29fc25b..92a34db 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_efuse.c
+++ b/drivers/staging/rtl8723au/core/rtw_efuse.c
@@ -335,7 +335,6 @@ EFUSE_Write1Byte(struct rtw_adapter *Adapter, u16 Address, u8 Value)
        u32     k = 0;
        u16     contentLen = 0;
 
-       /* RT_TRACE(COMP_EFUSE, DBG_LOUD, ("Addr =%x Data =%x\n", Address, Value)); */
        EFUSE_GetEfuseDefinition23a(Adapter, EFUSE_WIFI,
                                 TYPE_EFUSE_REAL_CONTENT_LEN,
                                 (void *)&contentLen);
@@ -404,8 +403,6 @@ efuse_OneByteWrite23a(struct rtw_adapter *pAdapter, u16 addr, u8 data)
        u8      tmpidx = 0;
        int     bResult;
 
-       /* RT_TRACE(COMP_EFUSE, DBG_LOUD, ("Addr = %x Data =%x\n", addr, data)); */
-
        /* return       0; */
 
        /*  -----------------e-fuse reg ctrl --------------------------------- */

diff --cc drivers/staging/rtl8723au/core/rtw_ieee80211.c
Simple merge

diff --cc drivers/staging/rtl8723au/core/rtw_mlme.c
Simple merge

diff --cc drivers/staging/rtl8723au/core/rtw_mlme_ext.c
Simple merge

diff --cc drivers/staging/rtl8723au/core/rtw_pwrctrl.c
Simple merge

diff --cc drivers/staging/rtl8723au/core/rtw_recv.c
Simple merge

diff --cc drivers/staging/rtl8723au/core/rtw_security.c
Simple merge

diff --cc drivers/staging/rtl8723au/core/rtw_sta_mgt.c
Simple merge

diff --cc drivers/staging/rtl8723au/core/rtw_wlan_util.c
Simple merge

diff --cc drivers/staging/rtl8723au/core/rtw_xmit.c
Simple merge

diff --cc drivers/staging/rtl8723au/hal/HalPwrSeqCmd.c
Simple merge

diff --cc drivers/staging/rtl8723au/hal/hal_com.c
Simple merge

diff --cc drivers/staging/rtl8723au/hal/odm_debug.c
Simple merge

diff --cc drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c
Simple merge

diff --cc drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
Simple merge

diff --cc drivers/staging/rtl8723au/hal/rtl8723a_phycfg.c
Simple merge

diff --cc drivers/staging/rtl8723au/hal/rtl8723au_recv.c
Simple merge

diff --cc drivers/staging/rtl8723au/hal/rtl8723au_xmit.c
Simple merge

diff --cc drivers/staging/rtl8723au/hal/usb_halinit.c
Simple merge

diff --cc drivers/staging/rtl8723au/hal/usb_ops_linux.c
Simple merge

diff --cc drivers/staging/rtl8723au/include/rtw_debug.h
Simple merge

diff --cc drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c
Simple merge

diff --cc drivers/staging/rtl8723au/os_dep/os_intfs.c
Simple merge

diff --cc drivers/staging/rtl8723au/os_dep/recv_linux.c
Simple merge

diff --cc drivers/staging/rtl8723au/os_dep/usb_intf.c
Simple merge

diff --cc drivers/staging/rtl8723au/os_dep/usb_ops_linux.c
Simple merge

diff --cc drivers/staging/rtl8723au/os_dep/xmit_linux.c
Simple merge