staging: rtl8723bs: hal: odm_HWConfig: Unneeded variable: "result". Return "HAL_STATU...

Remove function ODM_ConfigMACWithHeaderFile as trace is not necessary
and as it is getting called only once and call direct function
"ODM_ReadAndConfig_MP_8723B_MAC_REG"

Issue identified by coccicheck

Signed-off-by: Hariprasad Kelam <hariprasad.kelam@gmail.com>
----
changes v2: fixed typo in commit message
changes v3: Remove function ODM_ConfigMACWithHeaderFile and replace
            with ODM_ReadAndConfig_MP_8723B_MAC_REG

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723bs/hal/odm_HWConfig.c b/drivers/staging/rtl8723bs/hal/odm_HWConfig.c
index d802a1fde58fd13c60e282643d2b825fed9c7bc7..22f741066a8978d49d68987bb616f236f7905b04 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/odm_HWConfig.c
+++ b/drivers/staging/rtl8723bs/hal/odm_HWConfig.c
@@ -496,32 +496,3 @@ HAL_STATUS ODM_ConfigBBWithHeaderFile(
        return HAL_STATUS_SUCCESS;
 }
 
-HAL_STATUS ODM_ConfigMACWithHeaderFile(PDM_ODM_T pDM_Odm)
-{
-       u8 result = HAL_STATUS_SUCCESS;
-
-       ODM_RT_TRACE(
-               pDM_Odm,
-               ODM_COMP_INIT,
-               ODM_DBG_LOUD,
-               (
-                       "===>ODM_ConfigMACWithHeaderFile (%s)\n",
-                       (pDM_Odm->bIsMPChip) ? "MPChip" : "TestChip"
-               )
-       );
-       ODM_RT_TRACE(
-               pDM_Odm,
-               ODM_COMP_INIT,
-               ODM_DBG_LOUD,
-               (
-                       "pDM_Odm->SupportPlatform: 0x%X, pDM_Odm->SupportInterface: 0x%X, pDM_Odm->BoardType: 0x%X\n",
-                       pDM_Odm->SupportPlatform,
-                       pDM_Odm->SupportInterface,
-                       pDM_Odm->BoardType
-               )
-       );
-
-       READ_AND_CONFIG(8723B, _MAC_REG);
-
-       return result;
-}

diff --git a/drivers/staging/rtl8723bs/hal/odm_HWConfig.h b/drivers/staging/rtl8723bs/hal/odm_HWConfig.h
index d3af1caaa73cf1da2d0f138efdcce5a6f25d810a..945366bc37ce051d274ee4d26b780a5604c3361d 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/odm_HWConfig.h
+++ b/drivers/staging/rtl8723bs/hal/odm_HWConfig.h
@@ -140,8 +140,6 @@ HAL_STATUS ODM_ConfigBBWithHeaderFile(
        PDM_ODM_T pDM_Odm, ODM_BB_Config_Type ConfigType
 );
 
-HAL_STATUS ODM_ConfigMACWithHeaderFile(PDM_ODM_T pDM_Odm);
-
 HAL_STATUS ODM_ConfigFWWithHeaderFile(
        PDM_ODM_T pDM_Odm,
        ODM_FW_Config_Type ConfigType,

diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c b/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c
index 4f2ad54af398b9584898e3be3142e8b1982a74d2..d26bdfd11266b606d262a801803a0aabd457d47d 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c
@@ -375,7 +375,7 @@ s32 PHY_MACConfig8723B(struct adapter *Adapter)
        /*  */
        rtStatus = phy_ConfigMACWithParaFile(Adapter, pszMACRegFile);
        if (rtStatus == _FAIL) {
-               ODM_ConfigMACWithHeaderFile(&pHalData->odmpriv);
+               ODM_ReadAndConfig_MP_8723B_MAC_REG(&pHalData->odmpriv);
                rtStatus = _SUCCESS;
        }