Skip to content

Commit 6671dbb

Browse files
losgobbigregkh
authored andcommitted
staging: rtl8723bs: remove unused arg at odm_interface.h
The header file uses some macros to create proper constants for ODM_REG and ODM_SET but current macros were not using _ic_type, leading to a checkpatch warn: WARNING: Argument '_ic_type' is not used in function-like macro Remove that arg, currently there is no support for per ic type Signed-off-by: Rodrigo Gobbi <rodrigo.gobbi.7@gmail.com> Link: https://patch.msgid.link/20260325212826.20309-1-rodrigo.gobbi.7@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 84265cb commit 6671dbb

4 files changed

Lines changed: 16 additions & 16 deletions

File tree

drivers/staging/rtl8723bs/hal/odm.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,8 @@ u8 CCKSwingTable_Ch14_New[CCK_TABLE_SIZE][8] = {
131131

132132
static void odm_CommonInfoSelfInit(struct dm_odm_t *pDM_Odm)
133133
{
134-
pDM_Odm->bCckHighPower = (bool) PHY_QueryBBReg(pDM_Odm->Adapter, ODM_REG(CCK_RPT_FORMAT, pDM_Odm), ODM_BIT(CCK_RPT_FORMAT, pDM_Odm));
135-
pDM_Odm->RFPathRxEnable = (u8) PHY_QueryBBReg(pDM_Odm->Adapter, ODM_REG(BB_RX_PATH, pDM_Odm), ODM_BIT(BB_RX_PATH, pDM_Odm));
134+
pDM_Odm->bCckHighPower = (bool) PHY_QueryBBReg(pDM_Odm->Adapter, ODM_REG(CCK_RPT_FORMAT), ODM_BIT(CCK_RPT_FORMAT));
135+
pDM_Odm->RFPathRxEnable = (u8) PHY_QueryBBReg(pDM_Odm->Adapter, ODM_REG(BB_RX_PATH), ODM_BIT(BB_RX_PATH));
136136

137137
pDM_Odm->TxRate = 0xFF;
138138
}

drivers/staging/rtl8723bs/hal/odm_CfoTracking.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ static void odm_SetATCStatus(void *pDM_VOID, bool ATCStatus)
4747

4848
PHY_SetBBReg(
4949
pDM_Odm->Adapter,
50-
ODM_REG(BB_ATC, pDM_Odm),
51-
ODM_BIT(BB_ATC, pDM_Odm),
50+
ODM_REG(BB_ATC),
51+
ODM_BIT(BB_ATC),
5252
ATCStatus
5353
);
5454
pCfoTrack->bATCStatus = ATCStatus;
@@ -61,8 +61,8 @@ static bool odm_GetATCStatus(void *pDM_VOID)
6161

6262
ATCStatus = (bool)PHY_QueryBBReg(
6363
pDM_Odm->Adapter,
64-
ODM_REG(BB_ATC, pDM_Odm),
65-
ODM_BIT(BB_ATC, pDM_Odm)
64+
ODM_REG(BB_ATC),
65+
ODM_BIT(BB_ATC)
6666
);
6767
return ATCStatus;
6868
}

drivers/staging/rtl8723bs/hal/odm_DIG.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -297,9 +297,9 @@ void ODM_Write_DIG(void *pDM_VOID, u8 CurrentIGI)
297297
}
298298

299299
/* 1 Set IGI value */
300-
PHY_SetBBReg(pDM_Odm->Adapter, ODM_REG(IGI_A, pDM_Odm), ODM_BIT(IGI, pDM_Odm), CurrentIGI);
300+
PHY_SetBBReg(pDM_Odm->Adapter, ODM_REG(IGI_A), ODM_BIT(IGI), CurrentIGI);
301301

302-
PHY_SetBBReg(pDM_Odm->Adapter, ODM_REG(IGI_B, pDM_Odm), ODM_BIT(IGI, pDM_Odm), CurrentIGI);
302+
PHY_SetBBReg(pDM_Odm->Adapter, ODM_REG(IGI_B), ODM_BIT(IGI), CurrentIGI);
303303

304304
pDM_DigTable->CurIGValue = CurrentIGI;
305305
}
@@ -336,7 +336,7 @@ void odm_DIGInit(void *pDM_VOID)
336336

337337
pDM_DigTable->bStopDIG = false;
338338
pDM_DigTable->bPSDInProgress = false;
339-
pDM_DigTable->CurIGValue = (u8) PHY_QueryBBReg(pDM_Odm->Adapter, ODM_REG(IGI_A, pDM_Odm), ODM_BIT(IGI, pDM_Odm));
339+
pDM_DigTable->CurIGValue = (u8) PHY_QueryBBReg(pDM_Odm->Adapter, ODM_REG(IGI_A), ODM_BIT(IGI));
340340
pDM_DigTable->RssiLowThresh = DM_DIG_THRESH_LOW;
341341
pDM_DigTable->RssiHighThresh = DM_DIG_THRESH_HIGH;
342342
pDM_DigTable->FALowThresh = DMfalseALARM_THRESH_LOW;
@@ -806,7 +806,7 @@ void ODM_Write_CCK_CCA_Thres(void *pDM_VOID, u8 CurCCK_CCAThres)
806806

807807
/* modify by Guo.Mingzhi 2012-01-03 */
808808
if (pDM_DigTable->CurCCK_CCAThres != CurCCK_CCAThres)
809-
rtw_write8(pDM_Odm->Adapter, ODM_REG(CCK_CCA, pDM_Odm), CurCCK_CCAThres);
809+
rtw_write8(pDM_Odm->Adapter, ODM_REG(CCK_CCA), CurCCK_CCAThres);
810810

811811
pDM_DigTable->PreCCK_CCAThres = pDM_DigTable->CurCCK_CCAThres;
812812
pDM_DigTable->CurCCK_CCAThres = CurCCK_CCAThres;

drivers/staging/rtl8723bs/hal/odm_interface.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,18 @@
2323
#define ODM_REG_DIG_11N 0xC50
2424
#define ODM_REG_DIG_11AC 0xDDD
2525
26-
ODM_REG(DIG, _pDM_Odm)
26+
ODM_REG(DIG)
2727
=====================================*/
2828

2929
#define _reg_11N(_name) ODM_REG_##_name##_11N
3030
#define _bit_11N(_name) ODM_BIT_##_name##_11N
3131

32-
#define _cat(_name, _ic_type, _func) _func##_11N(_name)
32+
#define _cat(_name, _func) _func##_11N(_name)
3333

3434
/* _name: name of register or bit. */
35-
/* Example: "ODM_REG(R_A_AGC_CORE1, pDM_Odm)" */
36-
/* gets "ODM_R_A_AGC_CORE1" or "ODM_R_A_AGC_CORE1_8192C", depends on SupportICType. */
37-
#define ODM_REG(_name, _pDM_Odm) _cat(_name, _pDM_Odm->SupportICType, _reg)
38-
#define ODM_BIT(_name, _pDM_Odm) _cat(_name, _pDM_Odm->SupportICType, _bit)
35+
/* Example: "ODM_REG(R_A_AGC_CORE1)" */
36+
/* gets "ODM_R_A_AGC_CORE1" or "ODM_R_A_AGC_CORE1_8192C". */
37+
#define ODM_REG(_name) _cat(_name, _reg)
38+
#define ODM_BIT(_name) _cat(_name, _bit)
3939

4040
#endif /* __ODM_INTERFACE_H__ */

0 commit comments

Comments
 (0)