Commit 1dad326c authored by Marco Cesati's avatar Marco Cesati Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723bs: remove typedefs in rtw_efuse.h 



This commit fixes the following checkpatch.pl warnings:

    WARNING: do not add new typedefs
    #60: FILE: include/rtw_efuse.h:60:
    +typedef struct PG_PKT_STRUCT_A {

    WARNING: do not add new typedefs
    #68: FILE: include/rtw_efuse.h:68:
    +typedef struct _EFUSE_HAL {

Signed-off-by: default avatarMarco Cesati <marco.cesati@gmail.com>
Link: https://lore.kernel.org/r/20210312082638.25512-30-marco.cesati@gmail.com


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

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c

+14 −14
Original line number Diff line number Diff line
@@ -583,7 +583,7 @@ static u8 hal_EfuseSwitchToBank( 
	u32 value32 = 0;

#ifdef HAL_EFUSE_MEMORY

	struct hal_com_data *pHalData = GET_HAL_DATA(padapter);

	PEFUSE_HAL pEfuseHal = &pHalData->EfuseHal;

	struct EFUSE_HAL * pEfuseHal = &pHalData->EfuseHal;

#endif
@@ -864,7 +864,7 @@ static void hal_ReadEFuse_WiFi( 
{

#ifdef HAL_EFUSE_MEMORY

	struct hal_com_data *pHalData = GET_HAL_DATA(padapter);

	PEFUSE_HAL pEfuseHal = &pHalData->EfuseHal;

	struct EFUSE_HAL * pEfuseHal = &pHalData->EfuseHal;

#endif

	u8 *efuseTbl = NULL;

	u16 eFuse_Addr = 0;
@@ -1003,7 +1003,7 @@ static void hal_ReadEFuse_BT( 
{

#ifdef HAL_EFUSE_MEMORY

	struct hal_com_data *pHalData = GET_HAL_DATA(padapter);

	PEFUSE_HAL pEfuseHal = &pHalData->EfuseHal;

	struct EFUSE_HAL * pEfuseHal = &pHalData->EfuseHal;

#endif

	u8 *efuseTbl;

	u8 bank;
@@ -1146,7 +1146,7 @@ static u16 hal_EfuseGetCurrentSize_WiFi( 
{

#ifdef HAL_EFUSE_MEMORY

	struct hal_com_data *pHalData = GET_HAL_DATA(padapter);

	PEFUSE_HAL		pEfuseHal = &pHalData->EfuseHal;

	struct EFUSE_HAL *		pEfuseHal = &pHalData->EfuseHal;

#endif

	u16 efuse_addr = 0;

	u16 start_addr = 0; /*  for debug */
@@ -1244,7 +1244,7 @@ static u16 hal_EfuseGetCurrentSize_BT(struct adapter *padapter, u8 bPseudoTest) 
{

#ifdef HAL_EFUSE_MEMORY

	struct hal_com_data *pHalData = GET_HAL_DATA(padapter);

	PEFUSE_HAL pEfuseHal = &pHalData->EfuseHal;

	struct EFUSE_HAL * pEfuseHal = &pHalData->EfuseHal;

#endif

	u16 btusedbytes;

	u16 efuse_addr;
@@ -1549,7 +1549,7 @@ static void hal_EfuseConstructPGPkt( 
	u8 offset,

	u8 word_en,

	u8 *pData,

	PPGPKT_STRUCT pTargetPkt

	struct PGPKT_STRUCT * pTargetPkt

)

{

	memset(pTargetPkt->data, 0xFF, PGPKT_DATA_SIZE);
@@ -1563,12 +1563,12 @@ static u8 hal_EfusePartialWriteCheck( 
	struct adapter *padapter,

	u8 efuseType,

	u16 *pAddr,

	PPGPKT_STRUCT pTargetPkt,

	struct PGPKT_STRUCT * pTargetPkt,

	u8 bPseudoTest

)

{

	struct hal_com_data *pHalData = GET_HAL_DATA(padapter);

	PEFUSE_HAL pEfuseHal = &pHalData->EfuseHal;

	struct EFUSE_HAL * pEfuseHal = &pHalData->EfuseHal;

	u8 bRet = false;

	u16 startAddr = 0, efuse_max_available_len = 0, efuse_max = 0;

	u8 efuse_data = 0;
@@ -1681,7 +1681,7 @@ static u8 hal_EfusePgPacketWrite1ByteHeader( 
	struct adapter *padapter,

	u8 efuseType,

	u16 *pAddr,

	PPGPKT_STRUCT pTargetPkt,

	struct PGPKT_STRUCT * pTargetPkt,

	u8 bPseudoTest

)

{
@@ -1718,7 +1718,7 @@ static u8 hal_EfusePgPacketWrite2ByteHeader( 
	struct adapter *padapter,

	u8 efuseType,

	u16 *pAddr,

	PPGPKT_STRUCT pTargetPkt,

	struct PGPKT_STRUCT * pTargetPkt,

	u8 bPseudoTest

)

{
@@ -1785,7 +1785,7 @@ static u8 hal_EfusePgPacketWriteHeader( 
	struct adapter *padapter,

	u8 efuseType,

	u16 *pAddr,

	PPGPKT_STRUCT pTargetPkt,

	struct PGPKT_STRUCT * pTargetPkt,

	u8 bPseudoTest

)

{
@@ -1803,7 +1803,7 @@ static u8 hal_EfusePgPacketWriteData( 
	struct adapter *padapter,

	u8 efuseType,

	u16 *pAddr,

	PPGPKT_STRUCT pTargetPkt,

	struct PGPKT_STRUCT * pTargetPkt,

	u8 bPseudoTest

)

{
@@ -1830,7 +1830,7 @@ static s32 Hal_EfusePgPacketWrite( 
	bool bPseudoTest

)

{

	PGPKT_STRUCT targetPkt;

	struct PGPKT_STRUCT targetPkt;

	u16 startAddr = 0;

	u8 efuseType = EFUSE_WIFI;
@@ -1859,7 +1859,7 @@ static bool Hal_EfusePgPacketWrite_BT( 
	bool bPseudoTest

)

{

	PGPKT_STRUCT targetPkt;

	struct PGPKT_STRUCT targetPkt;

	u16 startAddr = 0;

	u8 efuseType = EFUSE_BT;

drivers/staging/rtl8723bs/include/hal_data.h

+1 −1
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ struct hal_com_data { 
	bool		EepromOrEfuse;

	u8 		EfuseUsedPercentage;

	u16 			EfuseUsedBytes;

	EFUSE_HAL		EfuseHal;

	struct EFUSE_HAL		EfuseHal;



	/* 3 [2.4G] */

	u8 Index24G_CCK_Base[MAX_RF_PATH][CHANNEL_MAX_NUMBER];

drivers/staging/rtl8723bs/include/rtw_efuse.h

+4 −4
Original line number Diff line number Diff line
@@ -57,15 +57,15 @@ enum _EFUSE_DEF_TYPE { 
#define		EFUSE_MAX_WORD_UNIT			4



/*------------------------------Define structure----------------------------*/

typedef struct PG_PKT_STRUCT_A {

struct PGPKT_STRUCT {

	u8 offset;

	u8 word_en;

	u8 data[8];

	u8 word_cnts;

} PGPKT_STRUCT, *PPGPKT_STRUCT;

};



/*------------------------------Define structure----------------------------*/

typedef struct _EFUSE_HAL {

struct EFUSE_HAL {

	u8 fakeEfuseBank;

	u32 fakeEfuseUsedBytes;

	u8 fakeEfuseContent[EFUSE_MAX_HW_SIZE];
@@ -82,7 +82,7 @@ typedef struct _EFUSE_HAL { 
	u8 fakeBTEfuseContent[EFUSE_MAX_BT_BANK][EFUSE_MAX_HW_SIZE];

	u8 fakeBTEfuseInitMap[EFUSE_BT_MAX_MAP_LEN];

	u8 fakeBTEfuseModifiedMap[EFUSE_BT_MAX_MAP_LEN];

} EFUSE_HAL, *PEFUSE_HAL;

};





/*------------------------Export global variable----------------------------*/