Commit b72290ce authored by Phillip Potter's avatar Phillip Potter Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: remove RT_TRACE calls from core/rtw_cmd.c 



Remove RT_TRACE macro calls from core/rtw_cmd.c, so that ultimately the
macro definition itself can eventually be removed.

Signed-off-by: default avatarPhillip Potter <phil@philpotter.co.uk>
Link: https://lore.kernel.org/r/20210806004034.82233-2-phil@philpotter.co.uk


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

drivers/staging/r8188eu/core/rtw_cmd.c

+7 −59
Original line number Diff line number Diff line
@@ -76,9 +76,6 @@ int _rtw_init_evt_priv(struct evt_priv *pevtpriv) 


void rtw_free_evt_priv(struct	evt_priv *pevtpriv)

{



	RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, ("+rtw_free_evt_priv\n"));



	_cancel_workitem_sync(&pevtpriv->c2h_wk);

	while (pevtpriv->c2h_wk_alive)

		msleep(10);
@@ -88,8 +85,6 @@ void rtw_free_evt_priv(struct evt_priv *pevtpriv) 
		if (c2h && c2h != (void *)pevtpriv)

			kfree(c2h);

	}

	RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, ("-rtw_free_evt_priv\n"));



}



void _rtw_free_cmd_priv (struct	cmd_priv *pcmdpriv)
@@ -170,10 +165,7 @@ u32 rtw_init_evt_priv (struct evt_priv *pevtpriv) 


void rtw_free_cmd_priv(struct	cmd_priv *pcmdpriv)

{



	RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, ("rtw_free_cmd_priv\n"));

	_rtw_free_cmd_priv(pcmdpriv);



}



static int rtw_cmd_filter(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj)
@@ -279,8 +271,6 @@ int rtw_cmd_thread(void *context) 
	pcmdpriv->cmdthd_running = true;

	up(&pcmdpriv->terminate_cmdthread_sema);



	RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, ("start r871x rtw_cmd_thread !!!!\n"));



	while (1) {

		if (_rtw_down_sema(&pcmdpriv->cmd_queue_sema) == _FAIL)

			break;
@@ -334,15 +324,12 @@ int rtw_cmd_thread(void *context) 
		/* call callback function for post-processed */

		if (pcmd->cmdcode < ARRAY_SIZE(rtw_cmd_callback)) {

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

			if (!pcmd_callback)

				rtw_free_cmd_obj(pcmd);

			} else {

			else

				/* todo: !!! fill rsp_buf to pcmd->rsp if (pcmd->rsp!= NULL) */

				pcmd_callback(pcmd->padapter, pcmd);/* need conider that free cmd_obj in rtw_cmd_callback */

			}

		} else {

			RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, ("%s: cmdcode = 0x%x callback not defined!\n", __func__, pcmd->cmdcode));

			rtw_free_cmd_obj(pcmd);

		}
@@ -434,8 +421,6 @@ u8 rtw_sitesurvey_cmd(struct adapter *padapter, struct ndis_802_11_ssid *ssid, 


	rtw_free_network_queue(padapter, false);



	RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, ("%s: flush network queue\n", __func__));



	init_h2fwcmd_w_parm_no_rsp(ph2c, psurveyPara, GEN_CMD_CODE(_SiteSurvey));



	/* psurveyPara->bsslimit = 48; */
@@ -576,8 +561,6 @@ u8 rtw_setphy_cmd(struct adapter *padapter, u8 modem, u8 ch) 


	init_h2fwcmd_w_parm_no_rsp(ph2c, psetphypara, _SetPhy_CMD_);



	RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, ("CH =%d, modem =%d", ch, modem));



	psetphypara->modem = modem;

	psetphypara->rfchannel = ch;
@@ -747,17 +730,11 @@ u8 rtw_createbss_cmd(struct adapter *padapter) 
{

	struct cmd_obj *pcmd;

	struct cmd_priv	*pcmdpriv = &padapter->cmdpriv;

	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;

	struct wlan_bssid_ex *pdev_network = &padapter->registrypriv.dev_network;

	u8	res = _SUCCESS;



	rtw_led_control(padapter, LED_CTL_START_TO_LINK);



	if (pmlmepriv->assoc_ssid.SsidLength == 0)

		RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, (" 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));



	pcmd = kzalloc(sizeof(struct cmd_obj), GFP_KERNEL);

	if (!pcmd) {

		res = _FAIL;
@@ -821,16 +798,9 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network *pnetwork) 


	rtw_led_control(padapter, LED_CTL_START_TO_LINK);



	if (pmlmepriv->assoc_ssid.SsidLength == 0) {

		RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, ("+Join cmd: Any SSid\n"));

	} else {

		RT_TRACE(_module_rtl871x_cmd_c_, _drv_notice_, ("+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_cmd: memory allocate for cmd_obj fail!!!\n"));

		goto exit;

	}

	/* for IEs is fix buf size */
@@ -859,8 +829,6 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network *pnetwork) 


		res = _FAIL;



		RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, ("rtw_joinbss_cmd :psecnetwork == NULL!!!\n"));



		goto exit;

	}
@@ -947,8 +915,6 @@ u8 rtw_disassoc_cmd(struct adapter *padapter, u32 deauth_timeout_ms, bool enqueu 
	struct cmd_priv *cmdpriv = &padapter->cmdpriv;

	u8 res = _SUCCESS;



	RT_TRACE(_module_rtl871x_cmd_c_, _drv_notice_, ("+rtw_disassoc_cmd\n"));



	/* prepare cmd parameter */

	param = kzalloc(sizeof(*param), GFP_ATOMIC);

	if (!param) {
@@ -1357,8 +1323,6 @@ u8 rtw_set_chplan_cmd(struct adapter *padapter, u8 chplan, u8 enqueue) 


	u8	res = _SUCCESS;



	RT_TRACE(_module_rtl871x_cmd_c_, _drv_notice_, ("+rtw_set_chplan_cmd\n"));



	/* check input parameter */

	if (!rtw_is_channel_plan_valid(chplan)) {

		res = _FAIL;
@@ -1410,8 +1374,6 @@ u8 rtw_led_blink_cmd(struct adapter *padapter, struct LED_871x *pLed) 


	u8	res = _SUCCESS;



	RT_TRACE(_module_rtl871x_cmd_c_, _drv_notice_, ("+rtw_led_blink_cmd\n"));



	pcmdobj = kzalloc(sizeof(struct cmd_obj), GFP_ATOMIC);

	if (!pcmdobj) {

		res = _FAIL;
@@ -1443,8 +1405,6 @@ u8 rtw_set_csa_cmd(struct adapter *padapter, u8 new_ch_no) 


	u8	res = _SUCCESS;



	RT_TRACE(_module_rtl871x_cmd_c_, _drv_notice_, ("+rtw_set_csa_cmd\n"));



	pcmdobj = kzalloc(sizeof(struct cmd_obj), GFP_ATOMIC);

	if (!pcmdobj) {

		res = _FAIL;
@@ -2040,7 +2000,6 @@ void rtw_survey_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd) 
		_set_timer(&pmlmepriv->scan_to_timer, 1);

		} else if (pcmd->res != H2C_SUCCESS) {

		_set_timer(&pmlmepriv->scan_to_timer, 1);

		RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, ("\n ********Error: MgntActrtw_set_802_11_bssid_LIST_SCAN Fail ************\n\n."));

	}



	/*  free cmd */
@@ -2056,7 +2015,6 @@ void rtw_disassoc_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd) 
		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."));

		return;

	} else /* clear bridge database */

		nat25_db_cleanup(padapter);
@@ -2074,7 +2032,6 @@ void rtw_joinbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd) 
		/* need to make timeout handlerOS independent */

		_set_timer(&pmlmepriv->assoc_timer, 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"));

		_set_timer(&pmlmepriv->assoc_timer, 1);

	}
@@ -2090,10 +2047,8 @@ void rtw_createbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd) 
	struct wlan_bssid_ex *pnetwork = (struct wlan_bssid_ex *)pcmd->parmbuf;

	struct wlan_network *tgt_network = &(pmlmepriv->cur_network);



	if ((pcmd->res != H2C_SUCCESS)) {

		RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, ("\n ********Error: rtw_createbss_cmd_callback  Fail ************\n\n."));

	if ((pcmd->res != H2C_SUCCESS))

		_set_timer(&pmlmepriv->assoc_timer, 1);

	}



	_cancel_timer(&pmlmepriv->assoc_timer, &timer_cancelled);
@@ -2103,11 +2058,9 @@ void rtw_createbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd) 
		psta = rtw_get_stainfo(&padapter->stapriv, pnetwork->MacAddress);

		if (!psta) {

			psta = rtw_alloc_stainfo(&padapter->stapriv, pnetwork->MacAddress);

			if (!psta) {

				RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, ("\nCan't alloc sta_info when createbss_cmd_callback\n"));

			if (!psta)

				goto createbss_cmd_fail;

		}

		}



		rtw_indicate_connect(padapter);

	} else {
@@ -2117,7 +2070,6 @@ void rtw_createbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd) 
		if (!pwlan) {

			pwlan = rtw_get_oldest_wlan_network(&pmlmepriv->scanned_queue);

			if (!pwlan) {

				RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, ("\n Error:  can't get pwlan in rtw_joinbss_event_callback\n"));

				spin_unlock_bh(&(pmlmepriv->scanned_queue.lock));

				goto createbss_cmd_fail;

			}
@@ -2151,10 +2103,8 @@ void rtw_setstaKey_cmdrsp_callback(struct adapter *padapter, struct cmd_obj *pc 
	struct set_stakey_rsp *psetstakey_rsp = (struct set_stakey_rsp *)(pcmd->rsp);

	struct sta_info *psta = rtw_get_stainfo(pstapriv, psetstakey_rsp->addr);



	if (!psta) {

		RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, ("\nERROR: rtw_setstaKey_cmdrsp_callback => can't get sta_info\n\n"));

	if (!psta)

		goto exit;

	}

exit:

	rtw_free_cmd_obj(pcmd);
@@ -2168,10 +2118,8 @@ void rtw_setassocsta_cmdrsp_callback(struct adapter *padapter, struct cmd_obj * 
	struct set_assocsta_rsp *passocsta_rsp = (struct set_assocsta_rsp *)(pcmd->rsp);

	struct sta_info *psta = rtw_get_stainfo(pstapriv, passocsta_parm->addr);



	if (!psta) {

		RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, ("\nERROR: setassocsta_cmdrsp_callbac => can't get sta_info\n\n"));

	if (!psta)

		goto exit;

	}



	psta->aid = passocsta_rsp->cam_id;

	psta->mac_id = passocsta_rsp->cam_id;