From: Jes Sorensen <jes.soren...@redhat.com>

Signed-off-by: Jes Sorensen <jes.soren...@redhat.com>
---
 drivers/staging/rtl8723au/hal/odm_HWConfig.c     | 7 -------
 drivers/staging/rtl8723au/hal/rtl8723a_phycfg.c  | 3 +--
 drivers/staging/rtl8723au/include/odm_HWConfig.h | 2 --
 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/drivers/staging/rtl8723au/hal/odm_HWConfig.c 
b/drivers/staging/rtl8723au/hal/odm_HWConfig.c
index b3c711a..26fbf6c 100644
--- 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 7dc2de0..bd01c10 100644
--- 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 2d0fc86..78021a8 100644
--- 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
-- 
1.9.3

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Reply via email to