Commit 3bb7e968 authored by Michael Straube's avatar Michael Straube Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: remove ReadEFuse from hal_ops 



Remove ReadEFuse from hal_ops and remove its wrapper
efuse_ReadEFuse(). Call rtl8188e_ReadEFuse() directly instead.

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


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

drivers/staging/r8188eu/core/rtw_efuse.c

+3 −8
Original line number Original line Diff line number Diff line
@@ -175,11 +175,6 @@ ReadEFuseByte( 
/* 					write addr must be after sec5. */

/* 					write addr must be after sec5. */

/*  */

/*  */





static void efuse_ReadEFuse(struct adapter *Adapter, u8 efuseType, u16 _offset, u16 _size_byte, u8 *pbuf, bool pseudo)

{

	Adapter->HalFunc.ReadEFuse(Adapter, efuseType, _offset, _size_byte, pbuf, pseudo);

}



void EFUSE_GetEfuseDefinition(struct adapter *pAdapter, u8 efuseType, u8 type, void *pOut, bool pseudo

void EFUSE_GetEfuseDefinition(struct adapter *pAdapter, u8 efuseType, u8 type, void *pOut, bool pseudo

	)

	)

{

{
@@ -450,7 +445,7 @@ u8 rtw_efuse_map_read(struct adapter *padapter, u16 addr, u16 cnts, u8 *data) 




	rtl8188e_EfusePowerSwitch(padapter, false, true);

	rtl8188e_EfusePowerSwitch(padapter, false, true);





	efuse_ReadEFuse(padapter, EFUSE_WIFI, addr, cnts, data, false);

	rtl8188e_ReadEFuse(padapter, EFUSE_WIFI, addr, cnts, data, false);





	rtl8188e_EfusePowerSwitch(padapter, false, false);

	rtl8188e_EfusePowerSwitch(padapter, false, false);
@@ -468,7 +463,7 @@ u8 rtw_BT_efuse_map_read(struct adapter *padapter, u16 addr, u16 cnts, u8 *data) 




	rtl8188e_EfusePowerSwitch(padapter, false, true);

	rtl8188e_EfusePowerSwitch(padapter, false, true);





	efuse_ReadEFuse(padapter, EFUSE_BT, addr, cnts, data, false);

	rtl8188e_ReadEFuse(padapter, EFUSE_BT, addr, cnts, data, false);





	rtl8188e_EfusePowerSwitch(padapter, false, false);

	rtl8188e_EfusePowerSwitch(padapter, false, false);
@@ -745,7 +740,7 @@ static void Efuse_ReadAllMap(struct adapter *pAdapter, u8 efuseType, u8 *Efuse, 




	EFUSE_GetEfuseDefinition(pAdapter, efuseType, TYPE_EFUSE_MAP_LEN, (void *)&mapLen, pseudo);

	EFUSE_GetEfuseDefinition(pAdapter, efuseType, TYPE_EFUSE_MAP_LEN, (void *)&mapLen, pseudo);





	efuse_ReadEFuse(pAdapter, efuseType, 0, mapLen, Efuse, pseudo);

	rtl8188e_ReadEFuse(pAdapter, efuseType, 0, mapLen, Efuse, pseudo);





	rtl8188e_EfusePowerSwitch(pAdapter, false, false);

	rtl8188e_EfusePowerSwitch(pAdapter, false, false);

}

}

drivers/staging/r8188eu/hal/rtl8188e_hal_init.c

+3 −4
Original line number Original line Diff line number Diff line
@@ -912,7 +912,7 @@ static void ReadEFuse_Pseudo(struct adapter *Adapter, u8 efuseType, u16 _offset, 
	Hal_EfuseReadEFuse88E(Adapter, _offset, _size_byte, pbuf, bPseudoTest);

	Hal_EfuseReadEFuse88E(Adapter, _offset, _size_byte, pbuf, bPseudoTest);

}

}





static void rtl8188e_ReadEFuse(struct adapter *Adapter, u8 efuseType,

void rtl8188e_ReadEFuse(struct adapter *Adapter, u8 efuseType,

			u16 _offset, u16 _size_byte, u8 *pbuf,

			u16 _offset, u16 _size_byte, u8 *pbuf,

			bool bPseudoTest)

			bool bPseudoTest)

{

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

	pHalFunc->write_rfreg = &rtl8188e_PHY_SetRFReg;





	/*  Efuse related function */

	/*  Efuse related function */

	pHalFunc->ReadEFuse = &rtl8188e_ReadEFuse;

	pHalFunc->EFUSEGetEfuseDefinition = &rtl8188e_EFUSE_GetEfuseDefinition;

	pHalFunc->EFUSEGetEfuseDefinition = &rtl8188e_EFUSE_GetEfuseDefinition;

	pHalFunc->EfuseGetCurrentSize = &rtl8188e_EfuseGetCurrentSize;

	pHalFunc->EfuseGetCurrentSize = &rtl8188e_EfuseGetCurrentSize;

	pHalFunc->Efuse_PgPacketRead = &rtl8188e_Efuse_PgPacketRead;

	pHalFunc->Efuse_PgPacketRead = &rtl8188e_Efuse_PgPacketRead;

drivers/staging/r8188eu/include/hal_intf.h

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

			       enum rf_radio_path eRFPath, u32 RegAddr,

			       u32 BitMask, u32 Data);

			       u32 BitMask, u32 Data);





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

			  u16 _size_byte, u8 *pbuf, bool bPseudoTest);

	void (*EFUSEGetEfuseDefinition)(struct adapter *padapter, u8 efuseType,

	void (*EFUSEGetEfuseDefinition)(struct adapter *padapter, u8 efuseType,

					u8 type, void *pOut, bool bPseudoTest);

					u8 type, void *pOut, bool bPseudoTest);

	u16	(*EfuseGetCurrentSize)(struct adapter *padapter, u8 efuseType,

	u16	(*EfuseGetCurrentSize)(struct adapter *padapter, u8 efuseType,
@@ -220,6 +218,9 @@ void rtl8188e_SetHalODMVar(struct adapter *Adapter, 
u32 rtl8188eu_InitPowerOn(struct adapter *adapt);

u32 rtl8188eu_InitPowerOn(struct adapter *adapt);





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

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

void rtl8188e_ReadEFuse(struct adapter *Adapter, u8 efuseType,

			u16 _offset, u16 _size_byte, u8 *pbuf,

			bool bPseudoTest);





void	rtw_hal_free_data(struct adapter *padapter);

void	rtw_hal_free_data(struct adapter *padapter);

uint rtw_hal_init(struct adapter *padapter);

uint rtw_hal_init(struct adapter *padapter);