From: navin patidar Date: Thu, 29 May 2014 17:50:42 +0000 (+0530) Subject: staging: rtl8188eu:Remove "silent_reset_inprogress" from struct sreset_priv X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b6d89f2fc3d5aa8c4e8b1f38ce2a63fec3a4ad99;p=openwrt%2Fstaging%2Fblogic.git staging: rtl8188eu:Remove "silent_reset_inprogress" from struct sreset_priv psrtpriv->silent_reset_inprogress is always false. Signed-off-by: navin patidar Reviewed-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8188eu/core/rtw_sreset.c b/drivers/staging/rtl8188eu/core/rtw_sreset.c index b7b787e3ba70..434c4336f048 100644 --- a/drivers/staging/rtl8188eu/core/rtw_sreset.c +++ b/drivers/staging/rtl8188eu/core/rtw_sreset.c @@ -25,7 +25,6 @@ void sreset_init_value(struct adapter *padapter) struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter); struct sreset_priv *psrtpriv = &pHalData->srestpriv; - psrtpriv->silent_reset_inprogress = false; psrtpriv->Wifi_Error_Status = WIFI_STATUS_SUCCESS; psrtpriv->last_tx_time = 0; psrtpriv->last_tx_complete_time = 0; @@ -35,7 +34,6 @@ void sreset_reset_value(struct adapter *padapter) struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter); struct sreset_priv *psrtpriv = &pHalData->srestpriv; - psrtpriv->silent_reset_inprogress = false; psrtpriv->Wifi_Error_Status = WIFI_STATUS_SUCCESS; psrtpriv->last_tx_time = 0; psrtpriv->last_tx_complete_time = 0; @@ -49,8 +47,6 @@ u8 sreset_get_wifi_status(struct adapter *padapter) u8 status = WIFI_STATUS_SUCCESS; u32 val32 = 0; - if (psrtpriv->silent_reset_inprogress) - return status; val32 = rtw_read32(padapter, REG_TXDMA_STATUS); if (val32 == 0xeaeaeaea) { psrtpriv->Wifi_Error_Status = WIFI_IF_NOT_EXIST; diff --git a/drivers/staging/rtl8188eu/include/rtw_sreset.h b/drivers/staging/rtl8188eu/include/rtw_sreset.h index fbfdffb4713f..8474180222bd 100644 --- a/drivers/staging/rtl8188eu/include/rtw_sreset.h +++ b/drivers/staging/rtl8188eu/include/rtw_sreset.h @@ -24,7 +24,6 @@ #include struct sreset_priv { - u8 silent_reset_inprogress; u8 Wifi_Error_Status; unsigned long last_tx_time; unsigned long last_tx_complete_time;