staging: r8188eu: remove ODM_Read1Byte

This is just a wrapper that calls rtw_read8. Remove the wrapper and
call rtw_read8 directly.

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

diff --git a/drivers/staging/r8188eu/hal/HalPhyRf_8188e.c b/drivers/staging/r8188eu/hal/HalPhyRf_8188e.c
index 60d4ba2751966952041b9fa4f928af50afc36c1e..6a7e2d60dfbf5f1ec60dc22f18794d2d08b14ddd 100644 (file)
--- a/drivers/staging/r8188eu/hal/HalPhyRf_8188e.c
+++ b/drivers/staging/r8188eu/hal/HalPhyRf_8188e.c
@@ -603,9 +603,9 @@ 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] = ODM_Read1Byte(dm_odm, MACReg[i]);
-       }
+       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]);
 }
 
@@ -938,7 +938,7 @@ static void phy_LCCalibrate_8188E(struct adapter *adapt, bool is2t)
        struct odm_dm_struct *dm_odm = &pHalData->odmpriv;
 
        /* Check continuous TX and Packet TX */
-       tmpreg = ODM_Read1Byte(dm_odm, 0xd03);
+       tmpreg = rtw_read8(adapt, 0xd03);
 
        if ((tmpreg & 0x70) != 0)                       /* Deal with contisuous TX case */
                ODM_Write1Byte(dm_odm, 0xd03, tmpreg & 0x8F);   /* disable all continuous TX */

diff --git a/drivers/staging/r8188eu/hal/odm_interface.c b/drivers/staging/r8188eu/hal/odm_interface.c
index 7ddba39a0f4b8ee0cb4e37b9cf38b76b62d86162..e44e24c2a86ea25ad75c363667d67832725d26da 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. */
 
-u8 ODM_Read1Byte(struct odm_dm_struct *pDM_Odm, u32 RegAddr)
-{
-       struct adapter *Adapter = pDM_Odm->Adapter;
-       return rtw_read8(Adapter, RegAddr);
-}
-
 u32 ODM_Read4Byte(struct odm_dm_struct *pDM_Odm, u32 RegAddr)
 {
        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 17a315d19a5049d62cc0d5ce536ea6b20fe97252..6e9a7d5860d8fad3d8b7f9dcf7ce9a5e6f958fec 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 */
 
-u8 ODM_Read1Byte(struct odm_dm_struct *pDM_Odm, u32 RegAddr);
-
 u32 ODM_Read4Byte(struct odm_dm_struct *pDM_Odm, u32 RegAddr);
 
 void ODM_Write1Byte(struct odm_dm_struct *pDM_Odm, u32 RegAddr, u8 Data);