Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754112AbcCIVyc (ORCPT ); Wed, 9 Mar 2016 16:54:32 -0500 Received: from mail-wm0-f49.google.com ([74.125.82.49]:36630 "EHLO mail-wm0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753094AbcCIVyX (ORCPT ); Wed, 9 Mar 2016 16:54:23 -0500 From: Claudiu Beznea To: Larry.Finger@lwfinger.net, florian.c.schilhabel@googlemail.com, gregkh@linuxfoundation.org, luisbg@osg.samsung.com, sudipm.mukherjee@gmail.com, vthakkar1994@gmail.com Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, Claudiu Beznea Subject: [PATCH] staging: rtl8712: added few code enhancements in rtl8712_led.c Date: Wed, 9 Mar 2016 23:54:18 +0200 Message-Id: <1457560458-20704-1-git-send-email-claudiu.beznea@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3780 Lines: 101 This patch tries to improve a part of the code from rtl8712_led.c by removing duplicates condition checks. Signed-off-by: Claudiu Beznea --- drivers/staging/rtl8712/rtl8712_led.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/drivers/staging/rtl8712/rtl8712_led.c b/drivers/staging/rtl8712/rtl8712_led.c index 9055827..aea6f2d 100644 --- a/drivers/staging/rtl8712/rtl8712_led.c +++ b/drivers/staging/rtl8712/rtl8712_led.c @@ -221,11 +221,9 @@ static void SwLedBlink(struct LED_871x *pLed) break; case LED_BLINK_StartToBlink: if (check_fwstate(pmlmepriv, _FW_LINKED) && - (pmlmepriv->fw_state & WIFI_STATION_STATE)) - bStopBlinking = true; - if (check_fwstate(pmlmepriv, _FW_LINKED) && - ((pmlmepriv->fw_state & WIFI_ADHOC_STATE) || - (pmlmepriv->fw_state & WIFI_ADHOC_MASTER_STATE))) + ((pmlmepriv->fw_state & WIFI_STATION_STATE) || + (pmlmepriv->fw_state & WIFI_ADHOC_STATE) || + (pmlmepriv->fw_state & WIFI_ADHOC_MASTER_STATE))) bStopBlinking = true; else if (pLed->BlinkTimes == 0) bStopBlinking = true; @@ -239,11 +237,12 @@ static void SwLedBlink(struct LED_871x *pLed) break; } if (bStopBlinking) { - if (check_fwstate(pmlmepriv, _FW_LINKED) && - !pLed->bLedOn) - SwLedOn(padapter, pLed); - else if (check_fwstate(pmlmepriv, _FW_LINKED) && pLed->bLedOn) - SwLedOff(padapter, pLed); + if (check_fwstate(pmlmepriv, _FW_LINKED)) { + if (pLed->bLedOn) + SwLedOff(padapter, pLed); + else + SwLedOn(padapter, pLed); + } pLed->BlinkTimes = 0; pLed->bLedBlinkInProgress = false; } else { @@ -340,7 +339,7 @@ static void SwLedBlink1(struct LED_871x *pLed) pLed->BlinkingLedState = LED_ON; mod_timer(&pLed->BlinkTimer, jiffies + msecs_to_jiffies(LED_BLINK_LINK_INTERVAL_ALPHA)); - } else if (!check_fwstate(pmlmepriv, _FW_LINKED)) { + } else { pLed->bLedNoLinkBlinkInProgress = true; pLed->CurrLedState = LED_BLINK_SLOWLY; if (pLed->bLedOn) @@ -374,7 +373,7 @@ static void SwLedBlink1(struct LED_871x *pLed) pLed->BlinkingLedState = LED_ON; mod_timer(&pLed->BlinkTimer, jiffies + msecs_to_jiffies(LED_BLINK_LINK_INTERVAL_ALPHA)); - } else if (!check_fwstate(pmlmepriv, _FW_LINKED)) { + } else { pLed->bLedNoLinkBlinkInProgress = true; pLed->CurrLedState = LED_BLINK_SLOWLY; if (pLed->bLedOn) @@ -450,7 +449,7 @@ static void SwLedBlink2(struct LED_871x *pLed) pLed->CurrLedState = LED_ON; pLed->BlinkingLedState = LED_ON; SwLedOn(padapter, pLed); - } else if (!check_fwstate(pmlmepriv, _FW_LINKED)) { + } else { pLed->CurrLedState = LED_OFF; pLed->BlinkingLedState = LED_OFF; SwLedOff(padapter, pLed); @@ -474,7 +473,7 @@ static void SwLedBlink2(struct LED_871x *pLed) pLed->CurrLedState = LED_ON; pLed->BlinkingLedState = LED_ON; SwLedOn(padapter, pLed); - } else if (!check_fwstate(pmlmepriv, _FW_LINKED)) { + } else { pLed->CurrLedState = LED_OFF; pLed->BlinkingLedState = LED_OFF; SwLedOff(padapter, pLed); @@ -517,7 +516,7 @@ static void SwLedBlink3(struct LED_871x *pLed) pLed->BlinkingLedState = LED_ON; if (!pLed->bLedOn) SwLedOn(padapter, pLed); - } else if (!check_fwstate(pmlmepriv, _FW_LINKED)) { + } else { pLed->CurrLedState = LED_OFF; pLed->BlinkingLedState = LED_OFF; if (pLed->bLedOn) @@ -543,7 +542,7 @@ static void SwLedBlink3(struct LED_871x *pLed) pLed->BlinkingLedState = LED_ON; if (!pLed->bLedOn) SwLedOn(padapter, pLed); - } else if (!check_fwstate(pmlmepriv, _FW_LINKED)) { + } else { pLed->CurrLedState = LED_OFF; pLed->BlinkingLedState = LED_OFF; if (pLed->bLedOn) -- 1.9.1