[PATCH 05/29] staging: rtl8723au: Remove some redundant check for hw_init_completed
Jes.Sorensen at redhat.com
Jes.Sorensen at redhat.com
Mon Jul 21 09:24:45 UTC 2014
From: Jes Sorensen <Jes.Sorensen at redhat.com>
Signed-off-by: Jes Sorensen <Jes.Sorensen at redhat.com>
---
drivers/staging/rtl8723au/hal/rtl8723a_dm.c | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_dm.c b/drivers/staging/rtl8723au/hal/rtl8723a_dm.c
index ac47a97..bf1db90 100644
--- a/drivers/staging/rtl8723au/hal/rtl8723a_dm.c
+++ b/drivers/staging/rtl8723au/hal/rtl8723a_dm.c
@@ -211,6 +211,7 @@ rtl8723a_HalDmWatchDog(
{
bool bFwCurrentInPSMode = false;
bool bFwPSAwake = true;
+ u8 bLinked = false;
u8 hw_init_completed = false;
struct hal_data_8723a *pHalData = GET_HAL_DATA(Adapter);
struct dm_priv *pdmpriv = &pHalData->dmpriv;
@@ -223,7 +224,7 @@ rtl8723a_HalDmWatchDog(
bFwCurrentInPSMode = Adapter->pwrctrlpriv.bFwCurrentInPSMode;
bFwPSAwake = rtl8723a_get_fwlps_rf_on(Adapter);
- if ((hw_init_completed) && ((!bFwCurrentInPSMode) && bFwPSAwake)) {
+ if (!bFwCurrentInPSMode && bFwPSAwake) {
/* Calculate Tx/Rx statistics. */
dm_CheckStatistics(Adapter);
@@ -238,16 +239,11 @@ rtl8723a_HalDmWatchDog(
}
/* ODM */
- if (hw_init_completed == true) {
- u8 bLinked = false;
+ if (rtw_linked_check(Adapter))
+ bLinked = true;
- if (rtw_linked_check(Adapter))
- bLinked = true;
-
- ODM_CmnInfoUpdate23a(&pHalData->odmpriv, ODM_CMNINFO_LINK,
- bLinked);
- ODM_DMWatchdog23a(&pHalData->odmpriv);
- }
+ ODM_CmnInfoUpdate23a(&pHalData->odmpriv, ODM_CMNINFO_LINK, bLinked);
+ ODM_DMWatchdog23a(&pHalData->odmpriv);
skip_dm:
--
1.9.3
More information about the devel
mailing list