Commit 5ec55c52 authored by Larry Finger's avatar Larry Finger Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: Remove macro ODM_GetRFReg 



This one is a duplicate od macro PHY_QueryRFReg.

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

drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c

+2 −2
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ odm_TXPowerTrackingCallback_ThermalMeter_8188E( 
		     ("===>dm_TXPowerTrackingCallback_ThermalMeter_8188E txpowercontrol %d\n",

		     dm_odm->RFCalibrateInfo.TxPowerTrackControl));



	ThermalValue = (u8)ODM_GetRFReg(dm_odm, RF_PATH_A, RF_T_METER_88E, 0xfc00);	/* 0x42: RF Reg[15:10] 88E */

	ThermalValue = (u8)PHY_QueryRFReg(Adapter, RF_PATH_A, RF_T_METER_88E, 0xfc00);	/* 0x42: RF Reg[15:10] 88E */



	ODM_RT_TRACE(dm_odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD,

		     ("Readback Thermal Meter = 0x%x pre thermal meter 0x%x EEPROMthermalmeter 0x%x\n",
@@ -450,7 +450,7 @@ odm_TXPowerTrackingCallback_ThermalMeter_8188E( 
				ODM_RT_TRACE(dm_odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD,

					     ("TxPwrTracking 0xc80 = 0x%x, 0xc94 = 0x%x RF 0x24 = 0x%x\n",

					     PHY_QueryBBReg(Adapter, 0xc80, bMaskDWord), PHY_QueryBBReg(Adapter,

					     0xc94, bMaskDWord), ODM_GetRFReg(dm_odm, RF_PATH_A, 0x24, bRFRegOffsetMask)));

					     0xc94, bMaskDWord), PHY_QueryRFReg(Adapter, RF_PATH_A, 0x24, bRFRegOffsetMask)));

			}

		}

drivers/staging/rtl8188eu/hal/odm.c

+2 −2
Original line number Diff line number Diff line
@@ -1992,8 +1992,8 @@ bool ODM_SingleDualAntennaDetection(struct odm_dm_struct *pDM_Odm, u8 mode) 


	/* 1 Backup Current RF/BB Settings */



	CurrentChannel = ODM_GetRFReg(pDM_Odm, RF_PATH_A, ODM_CHANNEL, bRFRegOffsetMask);

	RfLoopReg = ODM_GetRFReg(pDM_Odm, RF_PATH_A, 0x00, bRFRegOffsetMask);

	CurrentChannel = PHY_QueryRFReg(adapter, RF_PATH_A, ODM_CHANNEL, bRFRegOffsetMask);

	RfLoopReg = PHY_QueryRFReg(adapter, RF_PATH_A, 0x00, bRFRegOffsetMask);

	PHY_SetBBReg(adapter, rFPGA0_XA_RFInterfaceOE, ODM_DPDT, Antenna_A);  /*  change to Antenna A */

	/*  Step 1: USE IQK to transmitter single tone */

drivers/staging/rtl8188eu/hal/odm_interface.c

+0 −6
Original line number Diff line number Diff line
@@ -69,12 +69,6 @@ u32 ODM_GetMACReg(struct odm_dm_struct *pDM_Odm, u32 RegAddr, u32 BitMask) 
	return PHY_QueryBBReg(Adapter, RegAddr, BitMask);

}



u32 ODM_GetRFReg(struct odm_dm_struct *pDM_Odm, enum ODM_RF_RADIO_PATH	eRFPath, u32 RegAddr, u32 BitMask)

{

	struct adapter *Adapter = pDM_Odm->Adapter;

	return PHY_QueryRFReg(Adapter, (enum rf_radio_path)eRFPath, RegAddr, BitMask);

}



/*  ODM Memory relative API. */

void ODM_AllocateMemory(struct odm_dm_struct *pDM_Odm, void **pPtr, u32 length)

{

drivers/staging/rtl8188eu/include/odm_interface.h

+0 −3
Original line number Diff line number Diff line
@@ -94,9 +94,6 @@ void ODM_SetMACReg(struct odm_dm_struct *pDM_Odm, u32 RegAddr, 


u32 ODM_GetMACReg(struct odm_dm_struct *pDM_Odm, u32 RegAddr, u32 BitMask);



u32 ODM_GetRFReg(struct odm_dm_struct *pDM_Odm, enum ODM_RF_RADIO_PATH eRFPath,

		 u32 RegAddr, u32 BitMask);



/*  Memory Relative Function. */

void ODM_AllocateMemory(struct odm_dm_struct *pDM_Odm, void **pPtr, u32 length);

void ODM_FreeMemory(struct odm_dm_struct *pDM_Odm, void *pPtr, u32 length);