Commit d0cc39cd authored by Ross Schmidt's avatar Ross Schmidt Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723bs: remove ADPT_FMT macro 



Remove unnecessary macro for %s and call it directly.

Signed-off-by: default avatarRoss Schmidt <ross.schm.dev@gmail.com>
Link: https://lore.kernel.org/r/20201105034754.12383-5-ross.schm.dev@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d72425da

drivers/staging/rtl8723bs/core/rtw_cmd.c

+1 −1
Original line number Diff line number Diff line
@@ -503,7 +503,7 @@ int rtw_cmd_thread(void *context) 


		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);

		}

drivers/staging/rtl8723bs/core/rtw_mlme_ext.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

drivers/staging/rtl8723bs/core/rtw_security.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

		}

drivers/staging/rtl8723bs/core/rtw_wlan_util.c

+3 −3
Original line number Diff line number Diff line
@@ -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 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len) 
		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;

drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c

+6 −6
Original line number Diff line number Diff line
@@ -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);

	}