staging: rtl8723au: Baseband is always configured through PHY regs

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/rtl8723a_phycfg.c b/drivers/staging/rtl8723au/hal/rtl8723a_phycfg.c
index e0fff53487b22ed5c0c7d0efa94aa1101708eed2..1692c490578b1f31bcde526be926a31007ec4d88 100644 (file)
--- a/drivers/staging/rtl8723au/hal/rtl8723a_phycfg.c
+++ b/drivers/staging/rtl8723au/hal/rtl8723a_phycfg.c
@@ -698,7 +698,7 @@ storePwrIndexDiffRateOffset(struct rtw_adapter *Adapter, u32 RegAddr,
  * 11/10/2008  tynli   Modify to mew files.
  *---------------------------------------------------------------------------*/
 static int
-phy_ConfigBBWithPgHeaderFile(struct rtw_adapter *Adapter, u8 ConfigType)
+phy_ConfigBBWithPgHeaderFile(struct rtw_adapter *Adapter)
 {
        int i;
        u32 *Rtl819XPHY_REGArray_Table_PG;
@@ -707,17 +707,15 @@ phy_ConfigBBWithPgHeaderFile(struct rtw_adapter *Adapter, u8 ConfigType)
        PHY_REGArrayPGLen = Rtl8723_PHY_REG_Array_PGLength;
        Rtl819XPHY_REGArray_Table_PG = (u32 *)Rtl8723_PHY_REG_Array_PG;
 
-       if (ConfigType == BaseBand_Config_PHY_REG) {
-               for (i = 0; i < PHY_REGArrayPGLen; i = i + 3) {
-                       storePwrIndexDiffRateOffset(Adapter,
-                               Rtl819XPHY_REGArray_Table_PG[i],
-                               Rtl819XPHY_REGArray_Table_PG[i+1],
-                               Rtl819XPHY_REGArray_Table_PG[i+2]);
-               }
+       for (i = 0; i < PHY_REGArrayPGLen; i = i + 3) {
+               storePwrIndexDiffRateOffset(Adapter,
+                                           Rtl819XPHY_REGArray_Table_PG[i],
+                                           Rtl819XPHY_REGArray_Table_PG[i+1],
+                                           Rtl819XPHY_REGArray_Table_PG[i+2]);
        }
 
        return _SUCCESS;
-}      /* phy_ConfigBBWithPgHeaderFile */
+}
 
 static void
 phy_BB8192C_Config_1T(struct rtw_adapter *Adapter)
@@ -768,8 +766,7 @@ phy_BB8723a_Config_ParaFile(struct rtw_adapter *Adapter)
        if (pEEPROM->bautoload_fail_flag == false) {
                pHalData->pwrGroupCnt = 0;
 
-               rtStatus = phy_ConfigBBWithPgHeaderFile(Adapter,
-                                                       BaseBand_Config_PHY_REG);
+               rtStatus = phy_ConfigBBWithPgHeaderFile(Adapter);
        }
 
        if (rtStatus != _SUCCESS)

diff --git a/drivers/staging/rtl8723au/include/Hal8723APhyCfg.h b/drivers/staging/rtl8723au/include/Hal8723APhyCfg.h
index 66e275612424a4c3bfb8e291a26e4689f8347def..c1b7d084ac224d2a432cb74e6a5ca75e08fe2a67 100644 (file)
--- a/drivers/staging/rtl8723au/include/Hal8723APhyCfg.h
+++ b/drivers/staging/rtl8723au/include/Hal8723APhyCfg.h
@@ -49,11 +49,6 @@ enum WIRELESS_MODE {
        WIRELESS_MODE_AC        = BIT(6)
 };
 
-enum baseband_config_type {
-       BaseBand_Config_PHY_REG = 0,                    /* Radio Path A */
-       BaseBand_Config_AGC_TAB = 1,                    /* Radio Path B */
-};
-
 /* BB/RF related */
 enum rf_type_8190p {
        RF_TYPE_MIN,            /*  0 */