staging: rtl8723au: Remove obfuscating wrapper ODM_ConfigMACWithHeaderFile23a()

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_HWConfig.c b/drivers/staging/rtl8723au/hal/odm_HWConfig.c
index b3c711ad0ead16c6843975b5e33782f1863a1b98..26fbf6c38b998bba67f4617edbdb48dd41b86336 100644 (file)
--- a/drivers/staging/rtl8723au/hal/odm_HWConfig.c
+++ b/drivers/staging/rtl8723au/hal/odm_HWConfig.c
@@ -413,10 +413,3 @@ void ODM_PhyStatusQuery23a(struct dm_odm_t *pDM_Odm, struct phy_info *pPhyInfo,
 {
        ODM_PhyStatusQuery23a_92CSeries(pDM_Odm, pPhyInfo, pPhyStatus, pPktinfo);
 }
-
-int ODM_ConfigMACWithHeaderFile23a(struct dm_odm_t *pDM_Odm)
-{
-       if (pDM_Odm->SupportICType == ODM_RTL8723A)
-               ODM_ReadAndConfig_MAC_REG_8723A(pDM_Odm);
-       return _SUCCESS;
-}

diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_phycfg.c b/drivers/staging/rtl8723au/hal/rtl8723a_phycfg.c
index 7dc2de01610809586d73d0783d5de1e951704673..bd01c10ba8743832092afc44c9baf74ca0589e36 100644 (file)
--- a/drivers/staging/rtl8723au/hal/rtl8723a_phycfg.c
+++ b/drivers/staging/rtl8723au/hal/rtl8723a_phycfg.c
@@ -425,8 +425,7 @@ int PHY_MACConfig8723A(struct rtw_adapter *Adapter)
        /*  */
        /*  Config MAC */
        /*  */
-       if (ODM_ConfigMACWithHeaderFile23a(&pHalData->odmpriv) == _FAIL)
-               rtStatus = _FAIL;
+       ODM_ReadAndConfig_MAC_REG_8723A(&pHalData->odmpriv);
 
        /*  2010.07.13 AMPDU aggregation number 9 */
        /* rtw_write16(Adapter, REG_MAX_AGGR_NUM, MAX_AGGR_NUM); */

diff --git a/drivers/staging/rtl8723au/include/odm_HWConfig.h b/drivers/staging/rtl8723au/include/odm_HWConfig.h
index 2d0fc86a297e29fcbe375d1585ebe9651b0e80b9..78021a8cf8f959ee0f87788e1ab839756c85a538 100644 (file)
--- a/drivers/staging/rtl8723au/include/odm_HWConfig.h
+++ b/drivers/staging/rtl8723au/include/odm_HWConfig.h
@@ -152,6 +152,4 @@ ODM_PhyStatusQuery23a(
        struct odm_packet_info *pPktinfo
        );
 
-int ODM_ConfigMACWithHeaderFile23a(struct dm_odm_t *pDM_Odm);
-
 #endif