staging: rtl8723au: Remove pointless wrappers for calling odm_ConfigRFReg_8723A()

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/HalHWImg8723A_RF.c b/drivers/staging/rtl8723au/hal/HalHWImg8723A_RF.c
index 0f2ae05c8eae2944d71a774064ea0521e5f9528f..00480f5fcdab251ca353cd3864c6696dc1e3a9d9 100644 (file)
--- a/drivers/staging/rtl8723au/hal/HalHWImg8723A_RF.c
+++ b/drivers/staging/rtl8723au/hal/HalHWImg8723A_RF.c
@@ -230,7 +230,7 @@ void ODM_ReadAndConfig_RadioA_1T_8723A(struct dm_odm_t *pDM_Odm)
 
                /*  This (offset, data) pair meets the condition. */
                if (v1 < 0xCDCDCDCD) {
-                       odm_ConfigRF_RadioA_8723A(pDM_Odm, v1, v2);
+                       odm_ConfigRFReg_8723A(pDM_Odm, v1, v2, RF_PATH_A, v1);
                        continue;
                } else {
                        if (!CheckCondition(Array[i], hex)) {
@@ -247,7 +247,8 @@ void ODM_ReadAndConfig_RadioA_1T_8723A(struct dm_odm_t *pDM_Odm)
                                while (v2 != 0xDEAD &&
                                       v2 != 0xCDEF &&
                                       v2 != 0xCDCD && i < ArrayLen - 2) {
-                                       odm_ConfigRF_RadioA_8723A(pDM_Odm, v1, v2);
+                                       odm_ConfigRFReg_8723A(pDM_Odm, v1, v2,
+                                                             RF_PATH_A, v1);
                                        READ_NEXT_PAIR(v1, v2, i);
                                }
 

diff --git a/drivers/staging/rtl8723au/hal/odm_RegConfig8723A.c b/drivers/staging/rtl8723au/hal/odm_RegConfig8723A.c
index 70b7168aca7f14ec1088febe9846002070d35752..bd86b6c526eec8bd1ad4d28ac0c0e8e4ad150793 100644 (file)
--- a/drivers/staging/rtl8723au/hal/odm_RegConfig8723A.c
+++ b/drivers/staging/rtl8723au/hal/odm_RegConfig8723A.c
@@ -43,20 +43,6 @@ odm_ConfigRFReg_8723A(
        }
 }
 
-void odm_ConfigRF_RadioA_8723A(struct dm_odm_t *pDM_Odm, u32 Addr, u32 Data)
-{
-       odm_ConfigRFReg_8723A(pDM_Odm, Addr, Data, RF_PATH_A, Addr);
-       ODM_RT_TRACE(pDM_Odm, ODM_COMP_INIT, ODM_DBG_LOUD,
-                    ("===> %s: [RadioA] %08X %08X\n", __func__, Addr, Data));
-}
-
-void odm_ConfigRF_RadioB_8723A(struct dm_odm_t *pDM_Odm, u32 Addr, u32 Data)
-{
-       odm_ConfigRFReg_8723A(pDM_Odm, Addr, Data, RF_PATH_B, Addr);
-       ODM_RT_TRACE(pDM_Odm, ODM_COMP_INIT, ODM_DBG_LOUD,
-                    ("===> %s: [RadioB] %08X %08X\n", __func__, Addr, Data));
-}
-
 void odm_ConfigMAC_8723A(struct dm_odm_t *pDM_Odm,
        u32             Addr,
        u8              Data

diff --git a/drivers/staging/rtl8723au/include/odm_RegConfig8723A.h b/drivers/staging/rtl8723au/include/odm_RegConfig8723A.h
index 4ea579b2e8bdd0a1e8b97e0a5efa364bf3194ed4..4117830b3a8aaa04f7682dd222697b69d501474e 100644 (file)
--- a/drivers/staging/rtl8723au/include/odm_RegConfig8723A.h
+++ b/drivers/staging/rtl8723au/include/odm_RegConfig8723A.h
@@ -18,10 +18,6 @@
 void odm_ConfigRFReg_8723A(struct dm_odm_t *pDM_Odm, u32 Addr, u32 Data,
                           enum RF_RADIO_PATH RF_PATH, u32 RegAddr);
 
-void odm_ConfigRF_RadioA_8723A(struct dm_odm_t *pDM_Odm, u32 Addr, u32 Data);
-
-void odm_ConfigRF_RadioB_8723A(struct dm_odm_t *pDM_Odm, u32 Addr, u32 Data);
-
 void odm_ConfigMAC_8723A(struct dm_odm_t *pDM_Odm, u32 Addr, u8 Data);
 
 void odm_ConfigBB_AGC_8723A(struct dm_odm_t *pDM_Odm, u32 Addr,