Commit 1c7b5dff authored by Fabio Aiuto's avatar Fabio Aiuto Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723bs: remove all RT_TRACE logs in core/rtw_pwrctrl.c 



Remove all of the RT_TRACE logs in the core/rtw_pwrctrl.c file as they
currently do nothing as they require the code to be modified by
hand in order to be turned on. This obviously has not happened
since the code was merged. Moreover it relies on an unneeded
private log level tracing which overrides the in-kernel public one,
so just remove them as they are unused.

Signed-off-by: default avatarFabio Aiuto <fabioaiuto83@gmail.com>
Link: https://lore.kernel.org/r/a842ef8f93c920e52fed1b552968b679ca5e7be6.1617545239.git.fabioaiuto83@gmail.com


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

drivers/staging/rtl8723bs/core/rtw_pwrctrl.c

+4 −50
Original line number Diff line number Diff line
@@ -267,40 +267,26 @@ void rtw_set_rpwm(struct adapter *padapter, u8 pslv) 
		DBG_871X("%s: RPWM timeout, force to set RPWM(0x%02X) again!\n", __func__, pslv);

	} else {

		if ((pwrpriv->rpwm == pslv)

			|| ((pwrpriv->rpwm >= PS_STATE_S2) && (pslv >= PS_STATE_S2))) {

			RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_err_,

				("%s: Already set rpwm[0x%02X], new = 0x%02X!\n", __func__, pwrpriv->rpwm, pslv));

			|| ((pwrpriv->rpwm >= PS_STATE_S2) && (pslv >= PS_STATE_S2)))

			return;

		}



	}



	if ((padapter->bSurpriseRemoved) || !(padapter->hw_init_completed)) {

		RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_err_,

				 ("%s: SurpriseRemoved(%d) hw_init_completed(%d)\n",

				  __func__, padapter->bSurpriseRemoved, padapter->hw_init_completed));



		pwrpriv->cpwm = PS_STATE_S4;



		return;

	}



	if (padapter->bDriverStopped) {

		RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_err_,

				 ("%s: change power state(0x%02X) when DriverStopped\n", __func__, pslv));



		if (pslv < PS_STATE_S2) {

			RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_err_,

					 ("%s: Reject to enter PS_STATE(0x%02X) lower than S2 when DriverStopped!!\n", __func__, pslv));

		if (pslv < PS_STATE_S2)

			return;

	}

	}



	rpwm = pslv | pwrpriv->tog;

	/*  only when from PS_STATE S0/S1 to S2 and higher needs ACK */

	if ((pwrpriv->cpwm < PS_STATE_S2) && (pslv >= PS_STATE_S2))

		rpwm |= PS_ACK;

	RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_notice_,

			 ("rtw_set_rpwm: rpwm = 0x%02x cpwm = 0x%02x\n", rpwm, pwrpriv->cpwm));



	pwrpriv->rpwm = pslv;
@@ -382,14 +368,8 @@ void rtw_set_ps_mode(struct adapter *padapter, u8 ps_mode, u8 smart_ps, u8 bcn_a 
{

	struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter);



	RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_notice_,

			 ("%s: PowerMode =%d Smart_PS =%d\n",

			  __func__, ps_mode, smart_ps));



	if (ps_mode > PM_Card_Disable) {

		RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_err_, ("ps_mode:%d error\n", ps_mode));

	if (ps_mode > PM_Card_Disable)

		return;

	}



	if (pwrpriv->pwr_mode == ps_mode)

		if (PS_MODE_ACTIVE == ps_mode)
@@ -701,8 +681,6 @@ void cpwm_int_hdl(struct adapter *padapter, struct reportpwrstate_parm *preportp 
exit:

	mutex_unlock(&pwrpriv->lock);



	RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_notice_,

			 ("cpwm_int_hdl: cpwm = 0x%02x\n", pwrpriv->cpwm));

}



static void cpwm_event_callback(struct work_struct *work)
@@ -817,10 +795,6 @@ s32 rtw_register_task_alive(struct adapter *padapter, u32 task) 
	register_task_alive(pwrctrl, task);



	if (pwrctrl->bFwCurrentInPSMode) {

		RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_notice_,

				 ("%s: task = 0x%x cpwm = 0x%02x alives = 0x%08x\n",

				  __func__, task, pwrctrl->cpwm, pwrctrl->alives));



		if (pwrctrl->cpwm < pslv) {

			if (pwrctrl->cpwm < PS_STATE_S2)

				res = _FAIL;
@@ -869,10 +843,6 @@ void rtw_unregister_task_alive(struct adapter *padapter, u32 task) 
	unregister_task_alive(pwrctrl, task);



	if ((pwrctrl->pwr_mode != PS_MODE_ACTIVE) && pwrctrl->bFwCurrentInPSMode) {

		RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_notice_,

				 ("%s: cpwm = 0x%02x alives = 0x%08x\n",

				  __func__, pwrctrl->cpwm, pwrctrl->alives));



		if (pwrctrl->cpwm > pslv)

			if ((pslv >= PS_STATE_S2) || (pwrctrl->alives == 0))

				rtw_set_rpwm(padapter, pslv);
@@ -910,10 +880,6 @@ s32 rtw_register_tx_alive(struct adapter *padapter) 
	register_task_alive(pwrctrl, XMIT_ALIVE);



	if (pwrctrl->bFwCurrentInPSMode) {

		RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_notice_,

				 ("rtw_register_tx_alive: cpwm = 0x%02x alives = 0x%08x\n",

				  pwrctrl->cpwm, pwrctrl->alives));



		if (pwrctrl->cpwm < pslv) {

			if (pwrctrl->cpwm < PS_STATE_S2)

				res = _FAIL;
@@ -959,10 +925,6 @@ s32 rtw_register_cmd_alive(struct adapter *padapter) 
	register_task_alive(pwrctrl, CMD_ALIVE);



	if (pwrctrl->bFwCurrentInPSMode) {

		RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_info_,

				 ("rtw_register_cmd_alive: cpwm = 0x%02x alives = 0x%08x\n",

				  pwrctrl->cpwm, pwrctrl->alives));



		if (pwrctrl->cpwm < pslv) {

			if (pwrctrl->cpwm < PS_STATE_S2)

				res = _FAIL;
@@ -1008,10 +970,6 @@ void rtw_unregister_tx_alive(struct adapter *padapter) 
	unregister_task_alive(pwrctrl, XMIT_ALIVE);



	if ((pwrctrl->pwr_mode != PS_MODE_ACTIVE) && pwrctrl->bFwCurrentInPSMode) {

		RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_notice_,

				 ("%s: cpwm = 0x%02x alives = 0x%08x\n",

				  __func__, pwrctrl->cpwm, pwrctrl->alives));



		if (pwrctrl->cpwm > pslv)

			if ((pslv >= PS_STATE_S2) || (pwrctrl->alives == 0))

				rtw_set_rpwm(padapter, pslv);
@@ -1048,10 +1006,6 @@ void rtw_unregister_cmd_alive(struct adapter *padapter) 
	unregister_task_alive(pwrctrl, CMD_ALIVE);



	if ((pwrctrl->pwr_mode != PS_MODE_ACTIVE) && pwrctrl->bFwCurrentInPSMode) {

		RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_info_,

				 ("%s: cpwm = 0x%02x alives = 0x%08x\n",

				  __func__, pwrctrl->cpwm, pwrctrl->alives));



		if (pwrctrl->cpwm > pslv) {

			if ((pslv >= PS_STATE_S2) || (pwrctrl->alives == 0))

				rtw_set_rpwm(padapter, pslv);