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

staging: r8188eu: remove Efuse_PgPacketRead from hal_ops 



Remove Efuse_PgPacketRead from hal_ops and remove its wrapper
Efuse_PgPacketRead(). Call rtl8188e_Efuse_PgPacketRead() directly
instead.

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


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

drivers/staging/r8188eu/core/rtw_efuse.c

+0 −9
Original line number Diff line number Diff line
@@ -247,15 +247,6 @@ u8 efuse_OneByteWrite(struct adapter *pAdapter, u16 addr, u8 data, bool pseudo) 
	return result;

}



int Efuse_PgPacketRead(struct adapter *pAdapter, u8 offset, u8 *data, bool pseudo)

{

	int	ret = 0;



	ret =  pAdapter->HalFunc.Efuse_PgPacketRead(pAdapter, offset, data, pseudo);



	return ret;

}



int Efuse_PgPacketWrite(struct adapter *pAdapter, u8 offset, u8 word_en, u8 *data, bool pseudo)

{

	int ret;

drivers/staging/r8188eu/core/rtw_mp_ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -974,7 +974,7 @@ int rtl8188eu_oid_rt_pro_rw_efuse_pgpkt_hdl(struct oid_par_priv *poid_par_priv) 


	if (poid_par_priv->type_of_oid == QUERY_OID) {

		rtl8188e_EfusePowerSwitch(Adapter, false, true);

		if (Efuse_PgPacketRead(Adapter, ppgpkt->offset, ppgpkt->data, false))

		if (rtl8188e_Efuse_PgPacketRead(Adapter, ppgpkt->offset, ppgpkt->data, false))

			*poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;

		else

			status = NDIS_STATUS_FAILURE;

drivers/staging/r8188eu/hal/rtl8188e_hal_init.c

+2 −3
Original line number Diff line number Diff line
@@ -1294,7 +1294,7 @@ static int Hal_EfusePgPacketRead_Pseudo(struct adapter *pAdapter, u8 offset, u8 
	return ret;

}



static int rtl8188e_Efuse_PgPacketRead(struct adapter *pAdapter, u8 offset, u8 *data, bool bPseudoTest)

int rtl8188e_Efuse_PgPacketRead(struct adapter *pAdapter, u8 offset, u8 *data, bool bPseudoTest)

{

	int	ret;
@@ -1313,7 +1313,7 @@ static bool hal_EfuseFixHeaderProcess(struct adapter *pAdapter, u8 efuseType, st 


	memset((void *)originaldata, 0xff, 8);



	if (Efuse_PgPacketRead(pAdapter, pFixPkt->offset, originaldata, bPseudoTest)) {

	if (rtl8188e_Efuse_PgPacketRead(pAdapter, pFixPkt->offset, originaldata, bPseudoTest)) {

		/* check if data exist */

		badworden = Efuse_WordEnableDataWrite(pAdapter, efuse_addr + 1, pFixPkt->word_en, originaldata, bPseudoTest);
@@ -1782,7 +1782,6 @@ void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc) 
	pHalFunc->write_rfreg = &rtl8188e_PHY_SetRFReg;



	/*  Efuse related function */

	pHalFunc->Efuse_PgPacketRead = &rtl8188e_Efuse_PgPacketRead;

	pHalFunc->Efuse_PgPacketWrite = &rtl8188e_Efuse_PgPacketWrite;

	pHalFunc->Efuse_WordEnableDataWrite = &rtl8188e_Efuse_WordEnableDataWrite;

drivers/staging/r8188eu/include/hal_intf.h

+1 −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);



	int	(*Efuse_PgPacketRead)(struct adapter *adapter, u8 offset,

				      u8 *data, bool bPseudoTest);

	int	(*Efuse_PgPacketWrite)(struct adapter *padapter, u8 offset,

				       u8 word_en, u8 *data, bool bPseudoTest);

	u8	(*Efuse_WordEnableDataWrite)(struct adapter *padapter,
@@ -220,6 +218,7 @@ void rtl8188e_ReadEFuse(struct adapter *Adapter, u8 efuseType, 
void rtl8188e_EFUSE_GetEfuseDefinition(struct adapter *pAdapter, u8 efuseType,

				       u8 type, void *pOut, bool bPseudoTest);

u16 rtl8188e_EfuseGetCurrentSize(struct adapter *pAdapter, u8 efuseType, bool bPseudoTest);

int rtl8188e_Efuse_PgPacketRead(struct adapter *pAdapter, u8 offset, u8 *data, bool bPseudoTest);



void	rtw_hal_free_data(struct adapter *padapter);

uint rtw_hal_init(struct adapter *padapter);

drivers/staging/r8188eu/include/rtw_efuse.h

+0 −1
Original line number Diff line number Diff line
@@ -116,7 +116,6 @@ void ReadEFuseByte(struct adapter *adapter, u16 _offset, u8 *pbuf, bool test); 
u8 efuse_OneByteRead(struct adapter *adapter, u16 addr, u8 *data, bool test);

u8 efuse_OneByteWrite(struct adapter *adapter, u16 addr, u8 data, bool	test);



int Efuse_PgPacketRead(struct adapter *adapt, u8 offset, u8 *data, bool test);

int Efuse_PgPacketWrite(struct adapter *adapter, u8 offset, u8 word, u8 *data,

			bool test);

void efuse_WordEnableDataRead(u8 word_en, u8 *sourdata, u8 *targetdata);