Commit 9bbf2f32 authored by Philipp Hortmann's avatar Philipp Hortmann Committed by Greg Kroah-Hartman
Browse files

staging: rtl8192e: Remove ftrace-like logging in rtl819x_BAProc.c, ... 



Remove "Unnecessary ftrace-like logging" as requested by checkpatch.
Remove multiline macro as it is not needed anymore and not liked by
kernel community.

Reviewed-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarPhilipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/2c41e6856cd37b4f3e5cb1108272bcc24032bf64.1663387785.git.philipp.g.hortmann@gmail.com


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

drivers/staging/rtl8192e/rtl819x_BAProc.c

+0 −5
Original line number Diff line number Diff line
@@ -100,8 +100,6 @@ static struct sk_buff *rtllib_ADDBA(struct rtllib_device *ieee, u8 *Dst, 
	*tag++ = pBA->dialog_token;



	if (type == ACT_ADDBARSP) {

		RT_TRACE(COMP_DBG, "====>to send ADDBARSP\n");



		put_unaligned_le16(StatusCode, tag);

		tag += 2;

	}
@@ -183,7 +181,6 @@ static void rtllib_send_ADDBAReq(struct rtllib_device *ieee, u8 *dst, 
	skb = rtllib_ADDBA(ieee, dst, pBA, 0, ACT_ADDBAREQ);



	if (skb) {

		RT_TRACE(COMP_DBG, "====>to send ADDBAREQ!!!!!\n");

		softmac_mgmt_xmit(skb, ieee);

	} else {

		netdev_dbg(ieee->dev, "Failed to generate ADDBAReq packet.\n");
@@ -247,7 +244,6 @@ int rtllib_rx_ADDBAReq(struct rtllib_device *ieee, struct sk_buff *skb) 
	pBaTimeoutVal = (u16 *)(tag + 5);

	pBaStartSeqCtrl = (union sequence_control *)(req + 7);



	RT_TRACE(COMP_DBG, "====>rx ADDBAREQ from : %pM\n", dst);

	if (!ieee->current_network.qos_data.active ||

	    !ieee->pHTInfo->bCurrentHTSupport ||

	    (ieee->pHTInfo->IOTAction & HT_IOT_ACT_REJECT_ADDBA_REQ)) {
@@ -330,7 +326,6 @@ int rtllib_rx_ADDBARsp(struct rtllib_device *ieee, struct sk_buff *skb) 
	pBaParamSet = (union ba_param_set *)(tag + 5);

	pBaTimeoutVal = (u16 *)(tag + 7);



	RT_TRACE(COMP_DBG, "====>rx ADDBARSP from : %pM\n", dst);

	if (!ieee->current_network.qos_data.active ||

	    !ieee->pHTInfo->bCurrentHTSupport ||

	    !ieee->pHTInfo->bCurrentAMPDUEnable) {

drivers/staging/rtl8192e/rtllib_debug.h

+0 −6
Original line number Diff line number Diff line
@@ -46,10 +46,4 @@ enum RTL_DEBUG { 
	COMP_ERR		= BIT(31)

};



#define RT_TRACE(component, x, args...)		\

do {			\

	if (rt_global_debug_component & component) \

		printk(KERN_DEBUG DRV_NAME ":" x "\n", ##args);\

} while (0)



#endif

drivers/staging/rtl8192e/rtllib_softmac.c

+0 −8
Original line number Diff line number Diff line
@@ -1584,13 +1584,8 @@ static void rtllib_associate_procedure_wq(void *data) 
		ieee->data_hard_stop(ieee->dev);



	rtllib_stop_scan(ieee);

	RT_TRACE(COMP_DBG, "===>%s(), chan:%d\n", __func__,

		 ieee->current_network.channel);

	HTSetConnectBwMode(ieee, HT_CHANNEL_WIDTH_20, HT_EXTCHNL_OFFSET_NO_EXT);

	if (ieee->eRFPowerState == eRfOff) {

		RT_TRACE(COMP_DBG,

			 "=============>%s():Rf state is eRfOff, schedule ipsleave wq again,return\n",

			 __func__);

		if (ieee->rtllib_ips_leave_wq != NULL)

			ieee->rtllib_ips_leave_wq(ieee->dev);

		mutex_unlock(&ieee->wx_mutex);
@@ -2062,9 +2057,6 @@ static inline void rtllib_sta_ps(struct work_struct *work) 
	if ((ieee->ps == RTLLIB_PS_DISABLED ||

	     ieee->iw_mode != IW_MODE_INFRA ||

	     ieee->state != RTLLIB_LINKED)) {

		RT_TRACE(COMP_DBG,

			 "=====>%s(): no need to ps,wake up!! ieee->ps is %d, ieee->iw_mode is %d, ieee->state is %d\n",

			 __func__, ieee->ps, ieee->iw_mode, ieee->state);

		spin_lock_irqsave(&ieee->mgmt_tx_lock, flags2);

		rtllib_sta_wakeup(ieee, 1);

drivers/staging/rtl8192e/rtllib_softmac_wx.c

+0 −6
Original line number Diff line number Diff line
@@ -364,8 +364,6 @@ void rtllib_wx_sync_scan_wq(void *data) 
		b40M = 1;

		chan_offset = ieee->pHTInfo->CurSTAExtChnlOffset;

		bandwidth = (enum ht_channel_width)ieee->pHTInfo->bCurBW40MHz;

		RT_TRACE(COMP_DBG, "Scan in 40M, force to 20M first:%d, %d\n",

			 chan_offset, bandwidth);

		ieee->SetBWModeHandler(ieee->dev, HT_CHANNEL_WIDTH_20,

				       HT_EXTCHNL_OFFSET_NO_EXT);

	}
@@ -373,7 +371,6 @@ void rtllib_wx_sync_scan_wq(void *data) 
	rtllib_start_scan_syncro(ieee, 0);



	if (b40M) {

		RT_TRACE(COMP_DBG, "Scan in 20M, back to 40M\n");

		if (chan_offset == HT_EXTCHNL_OFFSET_UPPER)

			ieee->set_chan(ieee->dev, chan + 2);

		else if (chan_offset == HT_EXTCHNL_OFFSET_LOWER)
@@ -571,14 +568,11 @@ int rtllib_wx_set_power(struct rtllib_device *ieee, 
	mutex_lock(&ieee->wx_mutex);



	if (wrqu->power.disabled) {

		RT_TRACE(COMP_DBG, "===>%s(): power disable\n", __func__);

		ieee->ps = RTLLIB_PS_DISABLED;

		goto exit;

	}

	if (wrqu->power.flags & IW_POWER_TIMEOUT) {

		ieee->ps_timeout = wrqu->power.value / 1000;

		RT_TRACE(COMP_DBG, "===>%s():ps_timeout is %d\n", __func__,

			 ieee->ps_timeout);

	}



	if (wrqu->power.flags & IW_POWER_PERIOD)