Commit 2708d8d5 authored by Michael Straube's avatar Michael Straube Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: remove EfusePowerSwitch from hal_ops 



Remove EfusePowerSwitch from hal_ops and call
rtl8188e_EfusePowerSwitch() directly instead.

Signed-off-by: default avatarMichael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20210906190223.11396-22-straube.linux@gmail.com


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

drivers/staging/r8188eu/core/rtw_efuse.c

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ Efuse_PowerSwitch( 
		u8 write,

		u8 PwrState)

{

	pAdapter->HalFunc.EfusePowerSwitch(pAdapter, write, PwrState);

	rtl8188e_EfusePowerSwitch(pAdapter, write, PwrState);

}



/*-----------------------------------------------------------------------------

drivers/staging/r8188eu/hal/rtl8188e_hal_init.c

+1 −6
Original line number Diff line number Diff line
@@ -757,11 +757,7 @@ hal_EfusePowerSwitch_RTL8188E( 
	}

}



static void

rtl8188e_EfusePowerSwitch(

		struct adapter *pAdapter,

		u8 bWrite,

		u8 PwrState)

void rtl8188e_EfusePowerSwitch(struct adapter *pAdapter, u8 bWrite, u8 PwrState)

{

	hal_EfusePowerSwitch_RTL8188E(pAdapter, bWrite, PwrState);

}
@@ -1795,7 +1791,6 @@ void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc) 
	pHalFunc->write_rfreg = &rtl8188e_PHY_SetRFReg;



	/*  Efuse related function */

	pHalFunc->EfusePowerSwitch = &rtl8188e_EfusePowerSwitch;

	pHalFunc->ReadEFuse = &rtl8188e_ReadEFuse;

	pHalFunc->EFUSEGetEfuseDefinition = &rtl8188e_EFUSE_GetEfuseDefinition;

	pHalFunc->EfuseGetCurrentSize = &rtl8188e_EfuseGetCurrentSize;

drivers/staging/r8188eu/include/hal_intf.h

+2 −2
Original line number Diff line number Diff line
@@ -177,8 +177,6 @@ struct hal_ops { 
			       enum rf_radio_path eRFPath, u32 RegAddr,

			       u32 BitMask, u32 Data);



	void (*EfusePowerSwitch)(struct adapter *padapter, u8 bWrite,

				 u8 PwrState);

	void (*ReadEFuse)(struct adapter *padapter, u8 efuseType, u16 _offset,

			  u16 _size_byte, u8 *pbuf, bool bPseudoTest);

	void (*EFUSEGetEfuseDefinition)(struct adapter *padapter, u8 efuseType,
@@ -221,6 +219,8 @@ void rtl8188e_SetHalODMVar(struct adapter *Adapter, 
			   enum hal_odm_variable eVariable, void *pValue1, bool bSet);

u32 rtl8188eu_InitPowerOn(struct adapter *adapt);



void rtl8188e_EfusePowerSwitch(struct adapter *pAdapter, u8 bWrite, u8 PwrState);



void	rtw_hal_free_data(struct adapter *padapter);

uint rtw_hal_init(struct adapter *padapter);

uint rtw_hal_deinit(struct adapter *padapter);