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

staging: rtl8188eu: remove all RT_TRACE calls from os_dep/os_intfs.c 



Remove all RT_TRACE calls from os_dep/os_intfs.c as this macro is
unnecessary, and these calls are dubious in terms of necessity.
Removing all calls will ultimately allow the removal of the macro
itself.

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


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

drivers/staging/rtl8188eu/os_dep/os_intfs.c

+2 −37
Original line number Diff line number Diff line
@@ -301,8 +301,6 @@ struct net_device *rtw_init_netdev(void) 
	struct adapter *padapter;

	struct net_device *pnetdev;



	RT_TRACE(_module_os_intfs_c_, _drv_info_, ("+init_net_dev\n"));



	pnetdev = alloc_etherdev_mq(sizeof(struct adapter), 4);

	if (!pnetdev)

		return NULL;
@@ -324,8 +322,6 @@ static int rtw_start_drv_threads(struct adapter *padapter) 
{

	int err = 0;



	RT_TRACE(_module_os_intfs_c_, _drv_info_, ("+%s\n", __func__));



	padapter->cmdThread = kthread_run(rtw_cmd_thread, padapter, "RTW_CMD_THREAD");

	if (IS_ERR(padapter->cmdThread)) {

		err = PTR_ERR(padapter->cmdThread);
@@ -337,8 +333,6 @@ static int rtw_start_drv_threads(struct adapter *padapter) 


void rtw_stop_drv_threads(struct adapter *padapter)

{

	RT_TRACE(_module_os_intfs_c_, _drv_info_, ("+%s\n", __func__));



	if (!padapter->cmdThread)

		return;
@@ -421,18 +415,14 @@ u8 rtw_init_drv_sw(struct adapter *padapter) 
{

	u8 ret8 = _SUCCESS;



	RT_TRACE(_module_os_intfs_c_, _drv_info_, ("+%s\n", __func__));



	rtw_init_cmd_priv(&padapter->cmdpriv);



	if (rtw_init_mlme_priv(padapter) == _FAIL) {

		RT_TRACE(_module_os_intfs_c_, _drv_err_, ("\n Can't init mlme_priv\n"));

		ret8 = _FAIL;

		goto exit;

	}



	if (init_mlme_ext_priv(padapter) == _FAIL) {

		RT_TRACE(_module_os_intfs_c_, _drv_err_, ("\n Can't init mlme_ext_priv\n"));

		ret8 = _FAIL;

		goto exit;

	}
@@ -466,27 +456,19 @@ u8 rtw_init_drv_sw(struct adapter *padapter) 
	rtw_hal_sreset_init(padapter);



exit:

	RT_TRACE(_module_os_intfs_c_, _drv_info_, ("-%s\n", __func__));



	return ret8;

}



void rtw_cancel_all_timer(struct adapter *padapter)

{

	RT_TRACE(_module_os_intfs_c_, _drv_info_, ("+%s\n", __func__));



	del_timer_sync(&padapter->mlmepriv.assoc_timer);

	RT_TRACE(_module_os_intfs_c_, _drv_info_, ("%s:cancel association timer complete!\n", __func__));



	del_timer_sync(&padapter->mlmepriv.scan_to_timer);

	RT_TRACE(_module_os_intfs_c_, _drv_info_, ("%s:cancel scan_to_timer!\n", __func__));



	del_timer_sync(&padapter->mlmepriv.dynamic_chk_timer);

	RT_TRACE(_module_os_intfs_c_, _drv_info_, ("%s:cancel dynamic_chk_timer!\n", __func__));



	/*  cancel sw led timer */

	rtw_hal_sw_led_deinit(padapter);

	RT_TRACE(_module_os_intfs_c_, _drv_info_, ("%s:cancel DeInitSwLeds!\n", __func__));



	del_timer_sync(&padapter->pwrctrlpriv.pwr_state_check_timer);
@@ -495,8 +477,6 @@ void rtw_cancel_all_timer(struct adapter *padapter) 


u8 rtw_free_drv_sw(struct adapter *padapter)

{

	RT_TRACE(_module_os_intfs_c_, _drv_info_, ("==>%s", __func__));



	free_mlme_ext_priv(&padapter->mlmeextpriv);



	rtw_free_mlme_priv(&padapter->mlmepriv);
@@ -509,12 +489,8 @@ u8 rtw_free_drv_sw(struct adapter *padapter) 


	rtw_hal_free_data(padapter);



	RT_TRACE(_module_os_intfs_c_, _drv_info_, ("<== %s\n", __func__));



	mutex_destroy(&padapter->hw_init_mutex);



	RT_TRACE(_module_os_intfs_c_, _drv_info_, ("-%s\n", __func__));



	return _SUCCESS;

}
@@ -525,8 +501,6 @@ static int _netdev_open(struct net_device *pnetdev) 
	struct adapter *padapter = netdev_priv(pnetdev);

	struct pwrctrl_priv *pwrctrlpriv = &padapter->pwrctrlpriv;



	RT_TRACE(_module_os_intfs_c_, _drv_info_, ("+88eu_drv - dev_open\n"));



	if (pwrctrlpriv->ps_flag) {

		padapter->net_closed = false;

		goto netdev_open_normal_process;
@@ -537,10 +511,8 @@ static int _netdev_open(struct net_device *pnetdev) 
		padapter->bSurpriseRemoved = false;



		status = rtw_hal_init(padapter);

		if (status == _FAIL) {

			RT_TRACE(_module_os_intfs_c_, _drv_err_, ("rtl88eu_hal_init(): Can't init h/w!\n"));

		if (status == _FAIL)

			goto netdev_open_error;

		}



		pr_info("MAC Address = %pM\n", pnetdev->dev_addr);
@@ -574,14 +546,12 @@ static int _netdev_open(struct net_device *pnetdev) 
		netif_tx_wake_all_queues(pnetdev);



netdev_open_normal_process:

	RT_TRACE(_module_os_intfs_c_, _drv_info_, ("-88eu_drv - dev_open\n"));

	return 0;



netdev_open_error:

	padapter->bup = false;

	netif_carrier_off(pnetdev);

	netif_tx_stop_all_queues(pnetdev);

	RT_TRACE(_module_os_intfs_c_, _drv_err_, ("-88eu_drv - dev_open, fail!\n"));

	return -1;

}
@@ -607,10 +577,8 @@ int ips_netdrv_open(struct adapter *padapter) 
	padapter->bSurpriseRemoved = false;



	status = rtw_hal_init(padapter);

	if (status == _FAIL) {

		RT_TRACE(_module_os_intfs_c_, _drv_err_, ("%s(): Can't init h/w!\n", __func__));

	if (status == _FAIL)

		goto netdev_open_error;

	}



	rtw_hal_inirp_init(padapter);
@@ -661,8 +629,6 @@ static int netdev_close(struct net_device *pnetdev) 
{

	struct adapter *padapter = netdev_priv(pnetdev);



	RT_TRACE(_module_os_intfs_c_, _drv_info_, ("+88eu_drv - drv_close\n"));



	if (padapter->pwrctrlpriv.bInternalAutoSuspend) {

		if (padapter->pwrctrlpriv.rf_pwrstate == rf_off)

			padapter->pwrctrlpriv.ps_flag = true;
@@ -689,6 +655,5 @@ static int netdev_close(struct net_device *pnetdev) 
		led_control_8188eu(padapter, LED_CTL_POWER_OFF);

	}



	RT_TRACE(_module_os_intfs_c_, _drv_info_, ("-88eu_drv - drv_close\n"));

	return 0;

}