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>

diff --git a/drivers/staging/rtl8723bs/hal/odm.c b/drivers/staging/rtl8723bs/hal/odm.c
index 639b6da2302b4d4f18bcc3f2079c227c94c9dd4c..3dffa76207682b4d0c0276716c23237fbbd01bbb 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/odm.c
+++ b/drivers/staging/rtl8723bs/hal/odm.c
@@ -131,8 +131,8 @@ u8 CCKSwingTable_Ch14_New[CCK_TABLE_SIZE][8] = {
 
 static void odm_CommonInfoSelfInit(struct dm_odm_t *pDM_Odm)
 {
-       pDM_Odm->bCckHighPower = (bool) PHY_QueryBBReg(pDM_Odm->Adapter, ODM_REG(CCK_RPT_FORMAT, pDM_Odm), ODM_BIT(CCK_RPT_FORMAT, pDM_Odm));
-       pDM_Odm->RFPathRxEnable = (u8) PHY_QueryBBReg(pDM_Odm->Adapter, ODM_REG(BB_RX_PATH, pDM_Odm), ODM_BIT(BB_RX_PATH, pDM_Odm));
+       pDM_Odm->bCckHighPower = (bool) PHY_QueryBBReg(pDM_Odm->Adapter, ODM_REG(CCK_RPT_FORMAT), ODM_BIT(CCK_RPT_FORMAT));
+       pDM_Odm->RFPathRxEnable = (u8) PHY_QueryBBReg(pDM_Odm->Adapter, ODM_REG(BB_RX_PATH), ODM_BIT(BB_RX_PATH));
 
        pDM_Odm->TxRate = 0xFF;
 }

diff --git a/drivers/staging/rtl8723bs/hal/odm_CfoTracking.c b/drivers/staging/rtl8723bs/hal/odm_CfoTracking.c
index 166af5f6c9e02f3100b4f2e1753c6dee0769f98c..0eaedd8f6469716dc1180348f840a8c2b35e8c5b 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/odm_CfoTracking.c
+++ b/drivers/staging/rtl8723bs/hal/odm_CfoTracking.c
@@ -47,8 +47,8 @@ static void odm_SetATCStatus(void *pDM_VOID, bool ATCStatus)
 
        PHY_SetBBReg(
                pDM_Odm->Adapter,
-               ODM_REG(BB_ATC, pDM_Odm),
-               ODM_BIT(BB_ATC, pDM_Odm),
+               ODM_REG(BB_ATC),
+               ODM_BIT(BB_ATC),
                ATCStatus
        );
        pCfoTrack->bATCStatus = ATCStatus;
@@ -61,8 +61,8 @@ static bool odm_GetATCStatus(void *pDM_VOID)
 
        ATCStatus = (bool)PHY_QueryBBReg(
                pDM_Odm->Adapter,
-               ODM_REG(BB_ATC, pDM_Odm),
-               ODM_BIT(BB_ATC, pDM_Odm)
+               ODM_REG(BB_ATC),
+               ODM_BIT(BB_ATC)
        );
        return ATCStatus;
 }

diff --git a/drivers/staging/rtl8723bs/hal/odm_DIG.c b/drivers/staging/rtl8723bs/hal/odm_DIG.c
index 33661182d85a7cacea36885ce9d174bee5c34903..a31c8368f9d990c0524467cb1592db5a01a6bdd1 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/odm_DIG.c
+++ b/drivers/staging/rtl8723bs/hal/odm_DIG.c
@@ -297,9 +297,9 @@ void ODM_Write_DIG(void *pDM_VOID, u8 CurrentIGI)
                }
 
                /* 1 Set IGI value */
-               PHY_SetBBReg(pDM_Odm->Adapter, ODM_REG(IGI_A, pDM_Odm), ODM_BIT(IGI, pDM_Odm), CurrentIGI);
+               PHY_SetBBReg(pDM_Odm->Adapter, ODM_REG(IGI_A), ODM_BIT(IGI), CurrentIGI);
 
-               PHY_SetBBReg(pDM_Odm->Adapter, ODM_REG(IGI_B, pDM_Odm), ODM_BIT(IGI, pDM_Odm), CurrentIGI);
+               PHY_SetBBReg(pDM_Odm->Adapter, ODM_REG(IGI_B), ODM_BIT(IGI), CurrentIGI);
 
                pDM_DigTable->CurIGValue = CurrentIGI;
        }
@@ -336,7 +336,7 @@ void odm_DIGInit(void *pDM_VOID)
 
        pDM_DigTable->bStopDIG = false;
        pDM_DigTable->bPSDInProgress = false;
-       pDM_DigTable->CurIGValue = (u8) PHY_QueryBBReg(pDM_Odm->Adapter, ODM_REG(IGI_A, pDM_Odm), ODM_BIT(IGI, pDM_Odm));
+       pDM_DigTable->CurIGValue = (u8) PHY_QueryBBReg(pDM_Odm->Adapter, ODM_REG(IGI_A), ODM_BIT(IGI));
        pDM_DigTable->RssiLowThresh     = DM_DIG_THRESH_LOW;
        pDM_DigTable->RssiHighThresh    = DM_DIG_THRESH_HIGH;
        pDM_DigTable->FALowThresh       = DMfalseALARM_THRESH_LOW;
@@ -806,7 +806,7 @@ void ODM_Write_CCK_CCA_Thres(void *pDM_VOID, u8 CurCCK_CCAThres)
 
        /* modify by Guo.Mingzhi 2012-01-03 */
        if (pDM_DigTable->CurCCK_CCAThres != CurCCK_CCAThres)
-               rtw_write8(pDM_Odm->Adapter, ODM_REG(CCK_CCA, pDM_Odm), CurCCK_CCAThres);
+               rtw_write8(pDM_Odm->Adapter, ODM_REG(CCK_CCA), CurCCK_CCAThres);
 
        pDM_DigTable->PreCCK_CCAThres = pDM_DigTable->CurCCK_CCAThres;
        pDM_DigTable->CurCCK_CCAThres = CurCCK_CCAThres;

diff --git a/drivers/staging/rtl8723bs/hal/odm_interface.h b/drivers/staging/rtl8723bs/hal/odm_interface.h
index d19347b0289087b0816ae2049325afc689803d8c..400473ca58ca31bd6953ceb298219f0b89d15f65 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/odm_interface.h
+++ b/drivers/staging/rtl8723bs/hal/odm_interface.h
@@ -23,18 +23,18 @@
 #define ODM_REG_DIG_11N                0xC50
 #define ODM_REG_DIG_11AC       0xDDD
 
-ODM_REG(DIG, _pDM_Odm)
+ODM_REG(DIG)
 =====================================*/
 
 #define _reg_11N(_name)                        ODM_REG_##_name##_11N
 #define _bit_11N(_name)                        ODM_BIT_##_name##_11N
 
-#define _cat(_name, _ic_type, _func) _func##_11N(_name)
+#define _cat(_name, _func) _func##_11N(_name)
 
 /*  _name: name of register or bit. */
-/*  Example: "ODM_REG(R_A_AGC_CORE1, pDM_Odm)" */
-/*         gets "ODM_R_A_AGC_CORE1" or "ODM_R_A_AGC_CORE1_8192C", depends on SupportICType. */
-#define ODM_REG(_name, _pDM_Odm)       _cat(_name, _pDM_Odm->SupportICType, _reg)
-#define ODM_BIT(_name, _pDM_Odm)       _cat(_name, _pDM_Odm->SupportICType, _bit)
+/*  Example: "ODM_REG(R_A_AGC_CORE1)" */
+/*         gets "ODM_R_A_AGC_CORE1" or "ODM_R_A_AGC_CORE1_8192C". */
+#define ODM_REG(_name) _cat(_name, _reg)
+#define ODM_BIT(_name) _cat(_name, _bit)
 
 #endif /*  __ODM_INTERFACE_H__ */