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

Commit 2325182f authored by Larry Finger's avatar Larry Finger Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: Remove ODM_Read4Byte 



This routine is essentially a duplicate of rtw_read32.

Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e482338e

drivers/staging/rtl8188eu/hal/Hal8188ERateAdaptive.c

+5 −4
Original line number Diff line number Diff line
@@ -331,6 +331,7 @@ static void odm_RateDecision_8188E(struct odm_dm_struct *dm_odm, 


static int odm_ARFBRefresh_8188E(struct odm_dm_struct *dm_odm, struct odm_ra_info *pRaInfo)

{  /*  Wilson 2011/10/26 */

	struct adapter *adapt = dm_odm->Adapter;

	u32 MaskFromReg;

	s8 i;
@@ -357,19 +358,19 @@ static int odm_ARFBRefresh_8188E(struct odm_dm_struct *dm_odm, struct odm_ra_inf 
		pRaInfo->RAUseRate = (pRaInfo->RateMask)&0x0000000d;

		break;

	case 12:

		MaskFromReg = ODM_Read4Byte(dm_odm, REG_ARFR0);

		MaskFromReg = rtw_read32(adapt, REG_ARFR0);

		pRaInfo->RAUseRate = (pRaInfo->RateMask)&MaskFromReg;

		break;

	case 13:

		MaskFromReg = ODM_Read4Byte(dm_odm, REG_ARFR1);

		MaskFromReg = rtw_read32(adapt, REG_ARFR1);

		pRaInfo->RAUseRate = (pRaInfo->RateMask)&MaskFromReg;

		break;

	case 14:

		MaskFromReg = ODM_Read4Byte(dm_odm, REG_ARFR2);

		MaskFromReg = rtw_read32(adapt, REG_ARFR2);

		pRaInfo->RAUseRate = (pRaInfo->RateMask)&MaskFromReg;

		break;

	case 15:

		MaskFromReg = ODM_Read4Byte(dm_odm, REG_ARFR3);

		MaskFromReg = rtw_read32(adapt, REG_ARFR3);

		pRaInfo->RAUseRate = (pRaInfo->RateMask)&MaskFromReg;

		break;

	default:

drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c

+1 −1
Original line number Diff line number Diff line
@@ -841,7 +841,7 @@ static void _PHY_SaveMACRegisters( 
	for (i = 0; i < (IQK_MAC_REG_NUM - 1); i++) {

		MACBackup[i] = rtw_read8(adapt, MACReg[i]);

	}

	MACBackup[i] = ODM_Read4Byte(dm_odm, MACReg[i]);

	MACBackup[i] = rtw_read32(adapt, MACReg[i]);

}



static void reload_adda_reg(struct adapter *adapt, u32 *ADDAReg, u32 *ADDABackup, u32 RegiesterNum)

drivers/staging/rtl8188eu/hal/odm.c

+4 −4
Original line number Diff line number Diff line
@@ -1433,10 +1433,10 @@ void ODM_EdcaTurboInit(struct odm_dm_struct *pDM_Odm) 
	pDM_Odm->DM_EDCA_Table.bIsCurRDLState = false;

	Adapter->recvpriv.bIsAnyNonBEPkts = false;



	ODM_RT_TRACE(pDM_Odm, ODM_COMP_EDCA_TURBO, ODM_DBG_LOUD, ("Orginial VO PARAM: 0x%x\n", ODM_Read4Byte(pDM_Odm, ODM_EDCA_VO_PARAM)));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_EDCA_TURBO, ODM_DBG_LOUD, ("Orginial VI PARAM: 0x%x\n", ODM_Read4Byte(pDM_Odm, ODM_EDCA_VI_PARAM)));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_EDCA_TURBO, ODM_DBG_LOUD, ("Orginial BE PARAM: 0x%x\n", ODM_Read4Byte(pDM_Odm, ODM_EDCA_BE_PARAM)));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_EDCA_TURBO, ODM_DBG_LOUD, ("Orginial BK PARAM: 0x%x\n", ODM_Read4Byte(pDM_Odm, ODM_EDCA_BK_PARAM)));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_EDCA_TURBO, ODM_DBG_LOUD, ("Orginial VO PARAM: 0x%x\n", rtw_read32(Adapter, ODM_EDCA_VO_PARAM)));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_EDCA_TURBO, ODM_DBG_LOUD, ("Orginial VI PARAM: 0x%x\n", rtw_read32(Adapter, ODM_EDCA_VI_PARAM)));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_EDCA_TURBO, ODM_DBG_LOUD, ("Orginial BE PARAM: 0x%x\n", rtw_read32(Adapter, ODM_EDCA_BE_PARAM)));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_EDCA_TURBO, ODM_DBG_LOUD, ("Orginial BK PARAM: 0x%x\n", rtw_read32(Adapter, ODM_EDCA_BK_PARAM)));

}	/*  ODM_InitEdcaTurbo */



void odm_EdcaTurboCheck(struct odm_dm_struct *pDM_Odm)

drivers/staging/rtl8188eu/hal/odm_interface.c

+0 −6
Original line number Diff line number Diff line
@@ -21,12 +21,6 @@ 
#include "odm_precomp.h"

/*  ODM IO Relative API. */



u32 ODM_Read4Byte(struct odm_dm_struct *pDM_Odm, u32 RegAddr)

{

	struct adapter *Adapter = pDM_Odm->Adapter;

	return rtw_read32(Adapter, RegAddr);

}



void ODM_Write1Byte(struct odm_dm_struct *pDM_Odm, u32 RegAddr, u8 Data)

{

	struct adapter *Adapter = pDM_Odm->Adapter;

drivers/staging/rtl8188eu/include/odm_interface.h

+0 −2
Original line number Diff line number Diff line
@@ -77,8 +77,6 @@ typedef void (*RT_WORKITEM_CALL_BACK)(void *pContext); 


/*  =========== EXtern Function Prototype */



u32 ODM_Read4Byte(struct odm_dm_struct *pDM_Odm, u32 RegAddr);



void ODM_Write1Byte(struct odm_dm_struct *pDM_Odm, u32 RegAddr, u8 Data);



void ODM_Write2Byte(struct odm_dm_struct *pDM_Odm, u32 RegAddr, u16 Data);