From: Martin Kaiser Date: Sun, 12 Dec 2021 18:58:33 +0000 (+0100) Subject: staging: r8188eu: clean up rtl8188e_sreset_linked_status_check X-Git-Tag: v6.1-rc5~2247^2~146 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ed7d6119aa8bca3f8eec03b83248f09d2d39e88e;p=platform%2Fkernel%2Flinux-starfive.git staging: r8188eu: clean up rtl8188e_sreset_linked_status_check Clean up the rtl8188e_sreset_linked_status_check, which has just been moved to rtw_mlme_ext. Don't initialise variables to 0 if the first access sets a new value. Check the value of fw_status only once. Signed-off-by: Martin Kaiser Link: https://lore.kernel.org/r/20211212185833.22000-4-martin@kaiser.cx Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/r8188eu/core/rtw_mlme_ext.c index 15a443b..8e04238 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -7161,20 +7161,19 @@ static u8 chk_ap_is_alive(struct adapter *padapter, struct sta_info *psta) static void rtl8188e_sreset_linked_status_check(struct adapter *padapter) { - u32 rx_dma_status = 0; - u8 fw_status = 0; - rx_dma_status = rtw_read32(padapter, REG_RXDMA_STATUS); + u32 rx_dma_status = rtw_read32(padapter, REG_RXDMA_STATUS); + u8 fw_status; + if (rx_dma_status != 0x00) { DBG_88E("%s REG_RXDMA_STATUS:0x%08x\n", __func__, rx_dma_status); rtw_write32(padapter, REG_RXDMA_STATUS, rx_dma_status); } + fw_status = rtw_read8(padapter, REG_FMETHR); - if (fw_status != 0x00) { - if (fw_status == 1) - DBG_88E("%s REG_FW_STATUS (0x%02x), Read_Efuse_Fail !!\n", __func__, fw_status); - else if (fw_status == 2) - DBG_88E("%s REG_FW_STATUS (0x%02x), Condition_No_Match !!\n", __func__, fw_status); - } + if (fw_status == 1) + DBG_88E("%s REG_FW_STATUS (0x%02x), Read_Efuse_Fail !!\n", __func__, fw_status); + else if (fw_status == 2) + DBG_88E("%s REG_FW_STATUS (0x%02x), Condition_No_Match !!\n", __func__, fw_status); } void linked_status_chk(struct adapter *padapter)