Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e4d480b0 authored by Jes Sorensen's avatar Jes Sorensen Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723au: Remove RegBcnCtrlVal 



The value saved in RegBcnCtrlVal was never used. In addition the code
was highly endian broken, declaring it as a u32, then accessing it via
a u8 * later.

Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a2c379ce

drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c

+5 −13
Original line number Diff line number Diff line
@@ -882,20 +882,13 @@ void rtl8723a_read_chip_version(struct rtw_adapter *padapter) 
/*  */

void SetBcnCtrlReg23a(struct rtw_adapter *padapter, u8 SetBits, u8 ClearBits)

{

	struct hal_data_8723a *pHalData;

	u32 addr;

	u8 *pRegBcnCtrlVal;



	pHalData = GET_HAL_DATA(padapter);

	pRegBcnCtrlVal = (u8 *)&pHalData->RegBcnCtrlVal;



	addr = REG_BCN_CTRL;

	u8 val8;



	*pRegBcnCtrlVal = rtl8723au_read8(padapter, addr);

	*pRegBcnCtrlVal |= SetBits;

	*pRegBcnCtrlVal &= ~ClearBits;

	val8 = rtl8723au_read8(padapter, REG_BCN_CTRL);

	val8 |= SetBits;

	val8 &= ~ClearBits;



	rtl8723au_write8(padapter, addr, *pRegBcnCtrlVal);

	rtl8723au_write8(padapter, REG_BCN_CTRL, val8);

}



void rtl8723a_InitBeaconParameters(struct rtw_adapter *padapter)
@@ -903,7 +896,6 @@ void rtl8723a_InitBeaconParameters(struct rtw_adapter *padapter) 
	struct hal_data_8723a *pHalData = GET_HAL_DATA(padapter);



	rtl8723au_write16(padapter, REG_BCN_CTRL, 0x1010);

	pHalData->RegBcnCtrlVal = 0x1010;



	/*  TODO: Remove these magic number */

	rtl8723au_write16(padapter, REG_TBTT_PROHIBIT, 0x6404);	/*  ms */

drivers/staging/rtl8723au/include/rtl8723a_hal.h

+0 −1
Original line number Diff line number Diff line
@@ -356,7 +356,6 @@ struct hal_data_8723a { 
	u8	fw_ractrl;

	u8	RegTxPause;

	/*  Beacon function related global variable. */

	u32	RegBcnCtrlVal;

	u8	RegFwHwTxQCtrl;

	u8	RegReg542;