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

staging: r8188eu: remove Efuse_WordEnableDataWrite from hal_ops 



Remove Efuse_WordEnableDataWrite from hal_ops and remove its wrapper
Efuse_WordEnableDataWrite(). Call rtl8188e_Efuse_WordEnableDataWrite()
directly instead.

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


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

drivers/staging/r8188eu/core/rtw_efuse.c

+0 −9
Original line number Diff line number Diff line
@@ -284,15 +284,6 @@ void efuse_WordEnableDataRead(u8 word_en, u8 *sourdata, u8 *targetdata) 
	}

}



u8 Efuse_WordEnableDataWrite(struct adapter *pAdapter, u16 efuse_addr, u8 word_en, u8 *data, bool pseudo)

{

	u8 ret = 0;



	ret =  pAdapter->HalFunc.Efuse_WordEnableDataWrite(pAdapter, efuse_addr, word_en, data, pseudo);



	return ret;

}



static u8 efuse_read8(struct adapter *padapter, u16 address, u8 *value)

{

	return efuse_OneByteRead(padapter, address, value, false);

drivers/staging/r8188eu/hal/rtl8188e_hal_init.c

+3 −6
Original line number Diff line number Diff line
@@ -1315,7 +1315,7 @@ static bool hal_EfuseFixHeaderProcess(struct adapter *pAdapter, u8 efuseType, st 


	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);

		badworden = rtl8188e_Efuse_WordEnableDataWrite(pAdapter, efuse_addr + 1, pFixPkt->word_en, originaldata, bPseudoTest);



		if (badworden != 0xf) {	/*  write fail */

			PgWriteSuccess = rtl8188e_Efuse_PgPacketWrite(pAdapter, pFixPkt->offset, badworden, originaldata, bPseudoTest);
@@ -1442,7 +1442,7 @@ static bool hal_EfusePgPacketWriteData(struct adapter *pAdapter, u8 efuseType, u 
	u32	PgWriteSuccess = 0;



	badworden = 0x0f;

	badworden = Efuse_WordEnableDataWrite(pAdapter, efuse_addr + 1, pTargetPkt->word_en, pTargetPkt->data, bPseudoTest);

	badworden = rtl8188e_Efuse_WordEnableDataWrite(pAdapter, efuse_addr + 1, pTargetPkt->word_en, pTargetPkt->data, bPseudoTest);

	if (badworden == 0x0F) {

		/*  write ok */

		return true;
@@ -1569,7 +1569,7 @@ static bool hal_EfusePartialWriteCheck(struct adapter *pAdapter, u8 efuseType, u 
			    (!hal_EfuseCheckIfDatafollowed(pAdapter, curPkt.word_cnts, startAddr + 1, bPseudoTest)) &&

			    wordEnMatched(pTargetPkt, &curPkt, &matched_wden)) {

				/*  Here to write partial data */

				badworden = Efuse_WordEnableDataWrite(pAdapter, startAddr + 1, matched_wden, pTargetPkt->data, bPseudoTest);

				badworden = rtl8188e_Efuse_WordEnableDataWrite(pAdapter, startAddr + 1, matched_wden, pTargetPkt->data, bPseudoTest);

				if (badworden != 0x0F) {

					u32	PgWriteSuccess = 0;

					/*  if write fail on some words, write these bad words again */
@@ -1781,9 +1781,6 @@ void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc) 
	pHalFunc->read_rfreg = &rtl8188e_PHY_QueryRFReg;

	pHalFunc->write_rfreg = &rtl8188e_PHY_SetRFReg;



	/*  Efuse related function */

	pHalFunc->Efuse_WordEnableDataWrite = &rtl8188e_Efuse_WordEnableDataWrite;



	pHalFunc->IOL_exec_cmds_sync = &rtl8188e_IOL_exec_cmds_sync;



	pHalFunc->hal_notch_filter = &hal_notch_filter_8188e;

drivers/staging/r8188eu/include/hal_intf.h

+0 −4
Original line number Diff line number Diff line
@@ -177,10 +177,6 @@ struct hal_ops { 
			       enum rf_radio_path eRFPath, u32 RegAddr,

			       u32 BitMask, u32 Data);



	u8	(*Efuse_WordEnableDataWrite)(struct adapter *padapter,

					     u16 efuse_addr, u8 word_en,

					     u8 *data, bool bPseudoTest);



	int (*IOL_exec_cmds_sync)(struct adapter *padapter,

				  struct xmit_frame *frame, u32 max_wait,

				  u32 bndy_cnt);

drivers/staging/r8188eu/include/rtw_efuse.h

+0 −2
Original line number Diff line number Diff line
@@ -117,8 +117,6 @@ u8 efuse_OneByteRead(struct adapter *adapter, u16 addr, u8 *data, bool test); 
u8 efuse_OneByteWrite(struct adapter *adapter, u16 addr, u8 data, bool	test);



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

u8 Efuse_WordEnableDataWrite(struct adapter *adapter, u16 efuse_addr,

			     u8 word_en, u8 *data, bool test);



u8 EFUSE_Read1Byte(struct adapter *adapter, u16 address);

void EFUSE_ShadowMapUpdate(struct adapter *adapter, u8 efusetype, bool test);