staging: rtl8723bs: remove ADPT_FMT macro

Remove unnecessary macro for %s and call it directly.

Signed-off-by: Ross Schmidt <ross.schm.dev@gmail.com>
Link: https://lore.kernel.org/r/20201105034754.12383-5-ross.schm.dev@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723bs/core/rtw_cmd.c b/drivers/staging/rtl8723bs/core/rtw_cmd.c
index 4719f2c02dc8587e66e522a32e1c3d00902cc59e..729eae6e8dd16ec804ccfffa3e7903e3545529ae 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_cmd.c
+++ b/drivers/staging/rtl8723bs/core/rtw_cmd.c
@@ -503,7 +503,7 @@ post_process:
 
                cmd_process_time = jiffies_to_msecs(jiffies - cmd_start_time);
                if (cmd_process_time > 1000) {
-                       DBG_871X(ADPT_FMT "cmd= %d process_time= %lu > 1 sec\n",
+                       DBG_871X("%s cmd= %d process_time= %lu > 1 sec\n",
                                 ADPT_ARG(pcmd->padapter), pcmd->cmdcode,
                                 cmd_process_time);
                }

diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
index f81ab25415548df85f90a38b819ce5e4ef86e689..a0bb25031f1aa44c1118b3c898e976329332282a 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
@@ -5108,7 +5108,7 @@ void report_surveydone_event(struct adapter *padapter)
        psurveydone_evt = (struct surveydone_event *)(pevtcmd + sizeof(struct C2HEvent_Header));
        psurveydone_evt->bss_cnt = pmlmeext->sitesurvey_res.bss_cnt;
 
-       DBG_871X("survey done event(%x) band:%d for "ADPT_FMT"\n", psurveydone_evt->bss_cnt, padapter->setband, ADPT_ARG(padapter));
+       DBG_871X("survey done event(%x) band:%d for %s\n", psurveydone_evt->bss_cnt, padapter->setband, ADPT_ARG(padapter));
 
        rtw_enqueue_cmd(pcmdpriv, pcmd_obj);
 
@@ -5585,7 +5585,7 @@ void _linked_info_dump(struct adapter *padapter)
 
        if (padapter->bLinkInfoDump) {
 
-               DBG_871X("\n ============["ADPT_FMT"] linked status check ===================\n", ADPT_ARG(padapter));
+               DBG_871X("\n ============[%s] linked status check ===================\n", ADPT_ARG(padapter));
 
                if ((pmlmeinfo->state&0x03) == WIFI_FW_STATION_STATE) {
                        rtw_hal_get_def_var(padapter, HAL_DEF_UNDERCORATEDSMOOTHEDPWDB, &UndecoratedSmoothedPWDB);

diff --git a/drivers/staging/rtl8723bs/core/rtw_security.c b/drivers/staging/rtl8723bs/core/rtw_security.c
index 82e26acb772c18d3e41a9f47bf5de24e7606369f..81c15895f646997c9a6294230ad417e87fe208a5 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_security.c
+++ b/drivers/staging/rtl8723bs/core/rtw_security.c
@@ -2372,12 +2372,12 @@ u8 rtw_handle_tkip_countermeasure(struct adapter *adapter, const char *caller)
        if (securitypriv->btkip_countermeasure) {
                unsigned long passing_ms = jiffies_to_msecs(jiffies - securitypriv->btkip_countermeasure_time);
                if (passing_ms > 60*1000) {
-                       DBG_871X_LEVEL(_drv_always_, "%s("ADPT_FMT") countermeasure time:%lus > 60s\n",
+                       DBG_871X_LEVEL(_drv_always_, "%s(%s) countermeasure time:%lus > 60s\n",
                                caller, ADPT_ARG(adapter), passing_ms/1000);
                        securitypriv->btkip_countermeasure = false;
                        securitypriv->btkip_countermeasure_time = 0;
                } else {
-                       DBG_871X_LEVEL(_drv_always_, "%s("ADPT_FMT") countermeasure time:%lus < 60s\n",
+                       DBG_871X_LEVEL(_drv_always_, "%s(%s) countermeasure time:%lus < 60s\n",
                                caller, ADPT_ARG(adapter), passing_ms/1000);
                        status = _FAIL;
                }

diff --git a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
index e1c278501779da3028339e95e737b0ccd4877067..eda91b78a543f578b53400e084f5c9b4e0a80b4d 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
+++ b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
@@ -304,7 +304,7 @@ inline void rtw_set_oper_ch(struct adapter *adapter, u8 ch)
 
                for (i = 0; i < dvobj->iface_nums; i++) {
                        struct adapter *iface = dvobj->padapters[i];
-                       cnt += scnprintf(msg+cnt, len-cnt, " ["ADPT_FMT":", ADPT_ARG(iface));
+                       cnt += scnprintf(msg+cnt, len-cnt, " [%s:", ADPT_ARG(iface));
                        if (iface->mlmeextpriv.cur_channel == ch)
                                cnt += scnprintf(msg+cnt, len-cnt, "C");
                        else
@@ -1431,11 +1431,11 @@ _mismatch:
                pmlmepriv->timeBcnInfoChkStart = jiffies;
 
        pmlmepriv->NumOfBcnInfoChkFail++;
-       DBG_871X("%s by "ADPT_FMT" - NumOfChkFail = %d (SeqNum of this Beacon frame = %d).\n", __func__, ADPT_ARG(Adapter), pmlmepriv->NumOfBcnInfoChkFail, GetSequence(pframe));
+       DBG_871X("%s by %s - NumOfChkFail = %d (SeqNum of this Beacon frame = %d).\n", __func__, ADPT_ARG(Adapter), pmlmepriv->NumOfBcnInfoChkFail, GetSequence(pframe));
 
        if ((pmlmepriv->timeBcnInfoChkStart != 0) && (jiffies_to_msecs(jiffies - pmlmepriv->timeBcnInfoChkStart) <= DISCONNECT_BY_CHK_BCN_FAIL_OBSERV_PERIOD_IN_MS)
                && (pmlmepriv->NumOfBcnInfoChkFail >= DISCONNECT_BY_CHK_BCN_FAIL_THRESHOLD)) {
-               DBG_871X("%s by "ADPT_FMT" - NumOfChkFail = %d >= threshold : %d (in %d ms), return FAIL.\n", __func__, ADPT_ARG(Adapter), pmlmepriv->NumOfBcnInfoChkFail,
+               DBG_871X("%s by %s - NumOfChkFail = %d >= threshold : %d (in %d ms), return FAIL.\n", __func__, ADPT_ARG(Adapter), pmlmepriv->NumOfBcnInfoChkFail,
                        DISCONNECT_BY_CHK_BCN_FAIL_THRESHOLD, jiffies_to_msecs(jiffies - pmlmepriv->timeBcnInfoChkStart));
                pmlmepriv->timeBcnInfoChkStart = 0;
                pmlmepriv->NumOfBcnInfoChkFail = 0;

diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c b/drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c
index 93c93cdaadafc56516751c50755344c78d7dc5dd..56fea55513baf7b36d801ac562ed0c42b7f2f977 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c
@@ -1993,12 +1993,12 @@ void rtl8723b_download_rsvd_page(struct adapter *padapter, u8 mstatus)
 
                if (padapter->bSurpriseRemoved || padapter->bDriverStopped) {
                } else if (!bcn_valid)
-                       DBG_871X(ADPT_FMT": 1 DL RSVD page failed! DLBcnCount:%u, poll:%u\n",
+                       DBG_871X("%s: 1 DL RSVD page failed! DLBcnCount:%u, poll:%u\n",
                                ADPT_ARG(padapter), DLBcnCount, poll);
                else {
                        struct pwrctrl_priv *pwrctl = adapter_to_pwrctl(padapter);
                        pwrctl->fw_psmode_iface_id = padapter->iface_id;
-                       DBG_871X(ADPT_FMT": 1 DL RSVD page success! DLBcnCount:%u, poll:%u\n",
+                       DBG_871X("%s: 1 DL RSVD page success! DLBcnCount:%u, poll:%u\n",
                                ADPT_ARG(padapter), DLBcnCount, poll);
                }
 
@@ -2290,14 +2290,14 @@ void rtl8723b_download_BTCoex_AP_mode_rsvd_page(struct adapter *padapter)
        if (bcn_valid) {
                struct pwrctrl_priv *pwrctl = adapter_to_pwrctl(padapter);
                pwrctl->fw_psmode_iface_id = padapter->iface_id;
-               DBG_8192C(ADPT_FMT": DL RSVD page success! DLBcnCount:%d, poll:%d\n",
+               DBG_8192C("%s: DL RSVD page success! DLBcnCount:%d, poll:%d\n",
                        ADPT_ARG(padapter), DLBcnCount, poll);
        } else {
-               DBG_8192C(ADPT_FMT": DL RSVD page fail! DLBcnCount:%d, poll:%d\n",
+               DBG_8192C("%s: DL RSVD page fail! DLBcnCount:%d, poll:%d\n",
                        ADPT_ARG(padapter), DLBcnCount, poll);
-               DBG_8192C(ADPT_FMT": DL RSVD page fail! bSurpriseRemoved =%d\n",
+               DBG_8192C("%s: DL RSVD page fail! bSurpriseRemoved =%d\n",
                        ADPT_ARG(padapter), padapter->bSurpriseRemoved);
-               DBG_8192C(ADPT_FMT": DL RSVD page fail! bDriverStopped =%d\n",
+               DBG_8192C("%s: DL RSVD page fail! bDriverStopped =%d\n",
                        ADPT_ARG(padapter), padapter->bDriverStopped);
        }
 

diff --git a/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c b/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c
index 44799c4a9f35b95b13bab83264f330c69d4e15f3..6f9d082be7f307db1ee010eaad8b2202345a3c9b 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c
@@ -482,7 +482,7 @@ int rtl8723bs_xmit_thread(void *context)
        padapter = context;
        pxmitpriv = &padapter->xmitpriv;
 
-       rtw_sprintf(thread_name, 20, "RTWHALXT-" ADPT_FMT, ADPT_ARG(padapter));
+       rtw_sprintf(thread_name, 20, "RTWHALXT-%s", ADPT_ARG(padapter));
        thread_enter(thread_name);
 
        DBG_871X("start "FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(padapter));

diff --git a/drivers/staging/rtl8723bs/include/osdep_service_linux.h b/drivers/staging/rtl8723bs/include/osdep_service_linux.h
index 24386aa9ee1b2ddfd6dff13deee7552aa1a324e7..8608bc251eea791a20cd81899c122c243532c970 100644 (file)
--- a/drivers/staging/rtl8723bs/include/osdep_service_linux.h
+++ b/drivers/staging/rtl8723bs/include/osdep_service_linux.h
@@ -124,7 +124,6 @@ static inline void rtw_netif_stop_queue(struct net_device *pnetdev)
 #define rtw_signal_process(pid, sig) kill_pid(find_vpid((pid)), (sig), 1)
 
 #define NDEV_ARG(ndev) ndev->name
-#define ADPT_FMT "%s"
 #define ADPT_ARG(adapter) adapter->pnetdev->name
 #define FUNC_NDEV_FMT "%s(%s)"
 #define FUNC_NDEV_ARG(ndev) __func__, ndev->name