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

staging: rtl8188eu: remove all DBG_88E calls from hal/rtl8188e_cmd.c 



Remove all DBG_88E calls from hal/rtl8188e_cmd.c as this macro is
unnecessary, and many of 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/20210615001507.1171-19-phil@philpotter.co.uk


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

drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c

+6 −36
Original line number Diff line number Diff line
@@ -55,11 +55,8 @@ static s32 FillH2CCmd_88E(struct adapter *adapt, u8 ElementID, u32 CmdLen, u8 *p 
	u32 h2c_cmd_ex = 0;

	s32 ret = _FAIL;



	if (!adapt->bFWReady) {

		DBG_88E("%s(): return H2C cmd because fw is not ready\n",

			__func__);

	if (!adapt->bFWReady)

		return ret;

	}



	if (!pCmdBuffer)

		goto exit;
@@ -71,10 +68,8 @@ static s32 FillH2CCmd_88E(struct adapter *adapt, u8 ElementID, u32 CmdLen, u8 *p 
	/* pay attention to if  race condition happened in  H2C cmd setting. */

	h2c_box_num = adapt->HalData->LastHMEBoxNum;



	if (!_is_fw_read_cmd_down(adapt, h2c_box_num)) {

		DBG_88E(" fw read cmd failed...\n");

	if (!_is_fw_read_cmd_down(adapt, h2c_box_num))

		goto exit;

	}



	*(u8 *)(&h2c_cmd) = ElementID;
@@ -134,9 +129,6 @@ void rtw_hal_add_ra_tid(struct adapter *pAdapter, u32 bitmap, u8 arg, u8 rssi_le 


	bitmap &= 0x0fffffff;



	DBG_88E("%s=> mac_id:%d, raid:%d, ra_bitmap=0x%x, shortGIrate=0x%02x\n",

		__func__, macid, raid, bitmap, shortGIrate);



	ODM_RA_UpdateRateInfo_8188E(odmpriv, macid, raid, bitmap, shortGIrate);

}
@@ -146,9 +138,6 @@ void rtl8188e_set_FwPwrMode_cmd(struct adapter *adapt, u8 Mode) 
	struct pwrctrl_priv *pwrpriv = &adapt->pwrctrlpriv;

	u8 RLBM = 0; /*  0:Min, 1:Max, 2:User define */



	DBG_88E("%s: Mode=%d SmartPS=%d UAPSD=%d\n", __func__,

		Mode, pwrpriv->smart_ps, adapt->registrypriv.uapsd_enable);



	switch (Mode) {

	case PS_MODE_ACTIVE:

		H2CSetPwrMode.Mode = 0;
@@ -194,7 +183,6 @@ void rtl8188e_set_FwMediaStatus_cmd(struct adapter *adapt, __le16 mstatus_rpt) 
	opmode = (u8)mst_rpt;

	macid = (u8)(mst_rpt >> 8);



	DBG_88E("### %s: MStatus=%x MACID=%d\n", __func__, opmode, macid);

	FillH2CCmd_88E(adapt, H2C_COM_MEDIA_STATUS_RPT, sizeof(mst_rpt), (u8 *)&mst_rpt);

}
@@ -275,10 +263,8 @@ static void ConstructBeacon(struct adapter *adapt, u8 *pframe, u32 *pLength) 


_ConstructBeacon:



	if ((pktlen + TXDESC_SIZE) > 512) {

		DBG_88E("beacon frame too large\n");

	if ((pktlen + TXDESC_SIZE) > 512)

		return;

	}



	*pLength = pktlen;

}
@@ -440,12 +426,9 @@ static void SetFwRsvdPagePkt(struct adapter *adapt, bool bDLFinished) 
	struct rsvdpage_loc RsvdPageLoc;

	struct wlan_bssid_ex *pnetwork;



	DBG_88E("%s\n", __func__);

	ReservedPagePacket = kzalloc(1000, GFP_KERNEL);

	if (!ReservedPagePacket) {

		DBG_88E("%s: alloc ReservedPagePacket fail!\n", __func__);

	if (!ReservedPagePacket)

		return;

	}



	pxmitpriv = &adapt->xmitpriv;

	pmlmeext = &adapt->mlmeextpriv;
@@ -523,7 +506,6 @@ static void SetFwRsvdPagePkt(struct adapter *adapt, bool bDLFinished) 


	rtw_hal_mgnt_xmit(adapt, pmgntframe);



	DBG_88E("%s: Set RSVD page location to Fw\n", __func__);

	FillH2CCmd_88E(adapt, H2C_COM_RSVD_PAGE, sizeof(RsvdPageLoc), (u8 *)&RsvdPageLoc);



exit:
@@ -540,8 +522,6 @@ void rtl8188e_set_FwJoinBssReport_cmd(struct adapter *adapt, u8 mstatus) 
	u8 DLBcnCount = 0;

	u32 poll = 0;



	DBG_88E("%s mstatus(%x)\n", __func__, mstatus);



	if (mstatus == 1) {

		/*  We should set AID, correct TSF, HW seq enable before set JoinBssReport to Fw in 88/92C. */

		/*  Suggested by filen. Added by tynli. */
@@ -558,10 +538,8 @@ void rtl8188e_set_FwJoinBssReport_cmd(struct adapter *adapt, u8 mstatus) 
		usb_write8(adapt, REG_BCN_CTRL, usb_read8(adapt, REG_BCN_CTRL) & (~BIT(3)));

		usb_write8(adapt, REG_BCN_CTRL, usb_read8(adapt, REG_BCN_CTRL) | BIT(4));



		if (haldata->RegFwHwTxQCtrl & BIT(6)) {

			DBG_88E("HalDownloadRSVDPage(): There is an Adapter is sending beacon.\n");

		if (haldata->RegFwHwTxQCtrl & BIT(6))

			bSendBeacon = true;

		}



		/*  Set FWHW_TXQ_CTRL 0x422[6]=0 to tell Hw the packet is not a real beacon frame. */

		usb_write8(adapt, REG_FWHW_TXQ_CTRL + 2, (haldata->RegFwHwTxQCtrl & (~BIT(6))));
@@ -584,12 +562,6 @@ void rtl8188e_set_FwJoinBssReport_cmd(struct adapter *adapt, u8 mstatus) 
			} while (!bcn_valid && (poll % 10) != 0 && !adapt->bSurpriseRemoved && !adapt->bDriverStopped);

		} while (!bcn_valid && DLBcnCount <= 100 && !adapt->bSurpriseRemoved && !adapt->bDriverStopped);



		if (adapt->bSurpriseRemoved || adapt->bDriverStopped)

			;

		else if (!bcn_valid)

			DBG_88E("%s: 1 Download RSVD page failed! DLBcnCount:%u, poll:%u\n", __func__, DLBcnCount, poll);

		else

			DBG_88E("%s: 1 Download RSVD success! DLBcnCount:%u, poll:%u\n", __func__, DLBcnCount, poll);

		/*  */

		/*  We just can send the reserved page twice during the time that Tx thread is stopped (e.g. pnpsetpower) */

		/*  because we need to free the Tx BCN Desc which is used by the first reserved page packet. */
@@ -612,10 +584,8 @@ void rtl8188e_set_FwJoinBssReport_cmd(struct adapter *adapt, u8 mstatus) 
		}



		/*  Update RSVD page location H2C to Fw. */

		if (bcn_valid) {

		if (bcn_valid)

			rtw_hal_set_hwreg(adapt, HW_VAR_BCN_VALID, NULL);

			DBG_88E("Set RSVD page location to Fw.\n");

		}



		/*  Do not enable HW DMA BCN or it will cause Pcie interface hang by timing issue. 2011.11.24. by tynli. */

		/*  Clear CR[8] or beacon packet will not be send to TxBuf anymore. */