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

staging: r8188eu: remove Efuse_PgPacketWrite from hal_ops 



Remove Efuse_PgPacketWrite from hal_ops and remove its wrapper
Efuse_PgPacketWrite(). Call rtl8188e_Efuse_PgPacketWrite() directly
instead.

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


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

drivers/staging/r8188eu/core/rtw_efuse.c

+1 −10
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_PgPacketWrite(struct adapter *pAdapter, u8 offset, u8 word_en, u8 *data, bool pseudo)

{

	int ret;



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



	return ret;

}



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

 * Function:	efuse_WordEnableDataRead

 *
@@ -473,7 +464,7 @@ u8 rtw_efuse_map_write(struct adapter *padapter, u16 addr, u16 cnts, u8 *data) 
		}



		if (word_en != 0xF) {

			ret = Efuse_PgPacketWrite(padapter, offset, word_en, newdata, false);

			ret = rtl8188e_Efuse_PgPacketWrite(padapter, offset, word_en, newdata, false);

			DBG_88E("offset=%x\n", offset);

			DBG_88E("word_en=%x\n", word_en);

drivers/staging/r8188eu/core/rtw_mp_ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -981,7 +981,7 @@ int rtl8188eu_oid_rt_pro_rw_efuse_pgpkt_hdl(struct oid_par_priv *poid_par_priv) 
		rtl8188e_EfusePowerSwitch(Adapter, false, false);

	} else {

		rtl8188e_EfusePowerSwitch(Adapter, true, true);

		if (Efuse_PgPacketWrite(Adapter, ppgpkt->offset, ppgpkt->word_en, ppgpkt->data, false))

		if (rtl8188e_Efuse_PgPacketWrite(Adapter, ppgpkt->offset, ppgpkt->word_en, 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

+4 −5
Original line number Diff line number Diff line
@@ -1318,7 +1318,7 @@ static bool hal_EfuseFixHeaderProcess(struct adapter *pAdapter, u8 efuseType, st 
		badworden = Efuse_WordEnableDataWrite(pAdapter, efuse_addr + 1, pFixPkt->word_en, originaldata, bPseudoTest);



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

			PgWriteSuccess = Efuse_PgPacketWrite(pAdapter, pFixPkt->offset, badworden, originaldata, bPseudoTest);

			PgWriteSuccess = rtl8188e_Efuse_PgPacketWrite(pAdapter, pFixPkt->offset, badworden, originaldata, bPseudoTest);



			if (!PgWriteSuccess)

				return false;
@@ -1448,7 +1448,7 @@ static bool hal_EfusePgPacketWriteData(struct adapter *pAdapter, u8 efuseType, u 
		return true;

	} else {

		/* reorganize other pg packet */

		PgWriteSuccess = Efuse_PgPacketWrite(pAdapter, pTargetPkt->offset, badworden, pTargetPkt->data, bPseudoTest);

		PgWriteSuccess = rtl8188e_Efuse_PgPacketWrite(pAdapter, pTargetPkt->offset, badworden, pTargetPkt->data, bPseudoTest);

		if (!PgWriteSuccess)

			return false;

		else
@@ -1574,7 +1574,7 @@ static bool hal_EfusePartialWriteCheck(struct adapter *pAdapter, u8 efuseType, u 
					u32	PgWriteSuccess = 0;

					/*  if write fail on some words, write these bad words again */



					PgWriteSuccess = Efuse_PgPacketWrite(pAdapter, pTargetPkt->offset, badworden, pTargetPkt->data, bPseudoTest);

					PgWriteSuccess = rtl8188e_Efuse_PgPacketWrite(pAdapter, pTargetPkt->offset, badworden, pTargetPkt->data, bPseudoTest);



					if (!PgWriteSuccess) {

						bRet = false;	/*  write fail, return */
@@ -1665,7 +1665,7 @@ static int Hal_EfusePgPacketWrite(struct adapter *pAdapter, u8 offset, u8 word_e 
	return ret;

}



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

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

{

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



	/*  Efuse related function */

	pHalFunc->Efuse_PgPacketWrite = &rtl8188e_Efuse_PgPacketWrite;

	pHalFunc->Efuse_WordEnableDataWrite = &rtl8188e_Efuse_WordEnableDataWrite;



	pHalFunc->IOL_exec_cmds_sync = &rtl8188e_IOL_exec_cmds_sync;

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_PgPacketWrite)(struct adapter *padapter, u8 offset,

				       u8 word_en, u8 *data, bool bPseudoTest);

	u8	(*Efuse_WordEnableDataWrite)(struct adapter *padapter,

					     u16 efuse_addr, u8 word_en,

					     u8 *data, bool bPseudoTest);
@@ -219,6 +217,7 @@ 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);

int rtl8188e_Efuse_PgPacketWrite(struct adapter *pAdapter, u8 offset, u8 word_en, 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 −2
Original line number Diff line number Diff line
@@ -116,8 +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_PgPacketWrite(struct adapter *adapter, u8 offset, u8 word, 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);