staging: rtl8723au: Get rid of ODM_Read4Byte()

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723au/hal/odm.c b/drivers/staging/rtl8723au/hal/odm.c
index 247ae63..59af7bc 100644 (file)
--- a/drivers/staging/rtl8723au/hal/odm.c
+++ b/drivers/staging/rtl8723au/hal/odm.c
@@ -1256,7 +1256,6 @@ static void odm_TXPowerTrackingInit(struct dm_odm_t *pDM_Odm)
 /* EDCA Turbo */
 static void ODM_EdcaTurboInit23a(struct dm_odm_t *pDM_Odm)
 {
-
        struct rtw_adapter *Adapter = pDM_Odm->Adapter;
 
        pDM_Odm->DM_EDCA_Table.bCurrentTurboEDCA = false;
@@ -1264,16 +1263,16 @@ static void ODM_EdcaTurboInit23a(struct dm_odm_t *pDM_Odm)
 
        ODM_RT_TRACE(pDM_Odm, ODM_COMP_EDCA_TURBO, ODM_DBG_LOUD,
                     ("Orginial VO PARAM: 0x%x\n",
-                     ODM_Read4Byte(pDM_Odm, ODM_EDCA_VO_PARAM)));
+                     rtl8723au_read32(Adapter, ODM_EDCA_VO_PARAM)));
        ODM_RT_TRACE(pDM_Odm, ODM_COMP_EDCA_TURBO, ODM_DBG_LOUD,
                     ("Orginial VI PARAM: 0x%x\n",
-                     ODM_Read4Byte(pDM_Odm, ODM_EDCA_VI_PARAM)));
+                     rtl8723au_read32(Adapter, ODM_EDCA_VI_PARAM)));
        ODM_RT_TRACE(pDM_Odm, ODM_COMP_EDCA_TURBO, ODM_DBG_LOUD,
                     ("Orginial BE PARAM: 0x%x\n",
-                     ODM_Read4Byte(pDM_Odm, ODM_EDCA_BE_PARAM)));
+                     rtl8723au_read32(Adapter, ODM_EDCA_BE_PARAM)));
        ODM_RT_TRACE(pDM_Odm, ODM_COMP_EDCA_TURBO, ODM_DBG_LOUD,
                     ("Orginial BK PARAM: 0x%x\n",
-                     ODM_Read4Byte(pDM_Odm, ODM_EDCA_BK_PARAM)));
+                     rtl8723au_read32(Adapter, ODM_EDCA_BK_PARAM)));
 }
 
 static void odm_EdcaTurboCheck23a(struct dm_odm_t *pDM_Odm)

diff --git a/drivers/staging/rtl8723au/hal/odm_interface.c b/drivers/staging/rtl8723au/hal/odm_interface.c
index 0141300..5b57641 100644 (file)
--- a/drivers/staging/rtl8723au/hal/odm_interface.c
+++ b/drivers/staging/rtl8723au/hal/odm_interface.c
@@ -23,13 +23,6 @@
 /*  */
 #include <usb_ops_linux.h>
 
-u32 ODM_Read4Byte(struct dm_odm_t *pDM_Odm, u32 RegAddr)
-{
-       struct rtw_adapter *Adapter = pDM_Odm->Adapter;
-
-       return rtl8723au_read32(Adapter, RegAddr);
-}
-
 void ODM_SetBBReg(
        struct dm_odm_t *pDM_Odm,
        u32             RegAddr,

diff --git a/drivers/staging/rtl8723au/include/odm_interface.h b/drivers/staging/rtl8723au/include/odm_interface.h
index a4ce5ce..62a46c0 100644 (file)
--- a/drivers/staging/rtl8723au/include/odm_interface.h
+++ b/drivers/staging/rtl8723au/include/odm_interface.h
@@ -54,8 +54,6 @@ typedef void (*RT_WORKITEM_CALL_BACK)(struct work_struct *pContext);
 /*  =========== EXtern Function Prototype */
 /*  */
 
-
-u32 ODM_Read4Byte(struct dm_odm_t *pDM_Odm, u32 RegAddr);
 void ODM_SetBBReg(struct dm_odm_t *pDM_Odm, u32 RegAddr, u32 BitMask, u32 Data);
 u32 ODM_GetBBReg(struct dm_odm_t *pDM_Odm, u32 RegAddr, u32 BitMask);
 void ODM_SetRFReg(struct dm_odm_t *pDM_Odm, enum RF_RADIO_PATH eRFPath,