staging: r8188eu: remove ODM_Read4Byte

Remove the ODM_Read4Byte wrapper and call rtw_read32 directly.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20211102081833.18054-3-martin@kaiser.cx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/hal/Hal8188ERateAdaptive.c b/drivers/staging/r8188eu/hal/Hal8188ERateAdaptive.c
index 2d351f831289b12b1c6abbf437a4904999a91dd7..c9feb8f095fad7bfab0812e881352b7100365069 100644 (file)
--- a/drivers/staging/r8188eu/hal/Hal8188ERateAdaptive.c
+++ b/drivers/staging/r8188eu/hal/Hal8188ERateAdaptive.c
@@ -316,19 +316,19 @@ static int odm_ARFBRefresh_8188E(struct odm_dm_struct *dm_odm, struct odm_ra_inf
                pRaInfo->RAUseRate = (pRaInfo->RateMask) & 0x0000000d;
                break;
        case 12:
-               MaskFromReg = ODM_Read4Byte(dm_odm, REG_ARFR0);
+               MaskFromReg = rtw_read32(dm_odm->Adapter, REG_ARFR0);
                pRaInfo->RAUseRate = (pRaInfo->RateMask) & MaskFromReg;
                break;
        case 13:
-               MaskFromReg = ODM_Read4Byte(dm_odm, REG_ARFR1);
+               MaskFromReg = rtw_read32(dm_odm->Adapter, REG_ARFR1);
                pRaInfo->RAUseRate = (pRaInfo->RateMask) & MaskFromReg;
                break;
        case 14:
-               MaskFromReg = ODM_Read4Byte(dm_odm, REG_ARFR2);
+               MaskFromReg = rtw_read32(dm_odm->Adapter, REG_ARFR2);
                pRaInfo->RAUseRate = (pRaInfo->RateMask) & MaskFromReg;
                break;
        case 15:
-               MaskFromReg = ODM_Read4Byte(dm_odm, REG_ARFR3);
+               MaskFromReg = rtw_read32(dm_odm->Adapter, REG_ARFR3);
                pRaInfo->RAUseRate = (pRaInfo->RateMask) & MaskFromReg;
                break;
        default:

diff --git a/drivers/staging/r8188eu/hal/HalPhyRf_8188e.c b/drivers/staging/r8188eu/hal/HalPhyRf_8188e.c
index 6a7e2d60dfbf5f1ec60dc22f18794d2d08b14ddd..0057c3626bb20a38db5ab29f6f5283404f164b6d 100644 (file)
--- a/drivers/staging/r8188eu/hal/HalPhyRf_8188e.c
+++ b/drivers/staging/r8188eu/hal/HalPhyRf_8188e.c
@@ -601,12 +601,11 @@ static void _PHY_SaveMACRegisters(
        )
 {
        u32 i;
-       struct hal_data_8188e   *pHalData = GET_HAL_DATA(adapt);
-       struct odm_dm_struct *dm_odm = &pHalData->odmpriv;
+
        for (i = 0; i < (IQK_MAC_REG_NUM - 1); i++)
                MACBackup[i] = rtw_read8(adapt, MACReg[i]);
 
-       MACBackup[i] = ODM_Read4Byte(dm_odm, MACReg[i]);
+       MACBackup[i] = rtw_read32(adapt, MACReg[i]);
 }
 
 static void reload_adda_reg(struct adapter *adapt, u32 *ADDAReg, u32 *ADDABackup, u32 RegiesterNum)

diff --git a/drivers/staging/r8188eu/hal/odm_interface.c b/drivers/staging/r8188eu/hal/odm_interface.c
index e44e24c2a86ea25ad75c363667d67832725d26da..948fe0e42235bda3ed66e25a57954c3270c6d390 100644 (file)
--- a/drivers/staging/r8188eu/hal/odm_interface.c
+++ b/drivers/staging/r8188eu/hal/odm_interface.c
@@ -4,12 +4,6 @@
 #include "../include/odm_precomp.h"
 /*  ODM IO Relative API. */
 
-u32 ODM_Read4Byte(struct odm_dm_struct *pDM_Odm, u32 RegAddr)
-{
-       struct adapter *Adapter = pDM_Odm->Adapter;
-       return rtw_read32(Adapter, RegAddr);
-}
-
 void ODM_Write1Byte(struct odm_dm_struct *pDM_Odm, u32 RegAddr, u8 Data)
 {
        struct adapter *Adapter = pDM_Odm->Adapter;

diff --git a/drivers/staging/r8188eu/include/odm_interface.h b/drivers/staging/r8188eu/include/odm_interface.h
index 6e9a7d5860d8fad3d8b7f9dcf7ce9a5e6f958fec..a4fa123d239aa106643e66cb78d638a996e3ee28 100644 (file)
--- a/drivers/staging/r8188eu/include/odm_interface.h
+++ b/drivers/staging/r8188eu/include/odm_interface.h
@@ -19,8 +19,6 @@ typedef void (*RT_WORKITEM_CALL_BACK)(void *pContext);
 
 /*  =========== EXtern Function Prototype */
 
-u32 ODM_Read4Byte(struct odm_dm_struct *pDM_Odm, u32 RegAddr);
-
 void ODM_Write1Byte(struct odm_dm_struct *pDM_Odm, u32 RegAddr, u8 Data);
 
 void ODM_Write2Byte(struct odm_dm_struct *pDM_Odm, u32 RegAddr, u16 Data);