* [PATCH] staging: rtl8712: added few code enhancements in rtl8712_led.c
@ 2016-03-09 21:54 Claudiu Beznea
2016-03-11 18:19 ` Larry Finger
0 siblings, 1 reply; 2+ messages in thread
From: Claudiu Beznea @ 2016-03-09 21:54 UTC (permalink / raw)
To: Larry.Finger, florian.c.schilhabel, gregkh, luisbg,
sudipm.mukherjee, vthakkar1994
Cc: devel, linux-kernel, Claudiu Beznea
This patch tries to improve a part of the code from
rtl8712_led.c by removing duplicates condition checks.
Signed-off-by: Claudiu Beznea <claudiu.beznea@gmail.com>
---
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
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH] staging: rtl8712: added few code enhancements in rtl8712_led.c
2016-03-09 21:54 [PATCH] staging: rtl8712: added few code enhancements in rtl8712_led.c Claudiu Beznea
@ 2016-03-11 18:19 ` Larry Finger
0 siblings, 0 replies; 2+ messages in thread
From: Larry Finger @ 2016-03-11 18:19 UTC (permalink / raw)
To: Claudiu Beznea, florian.c.schilhabel, gregkh, luisbg,
sudipm.mukherjee, vthakkar1994
Cc: devel, linux-kernel
On 03/09/2016 03:54 PM, Claudiu Beznea wrote:
> This patch tries to improve a part of the code from
> rtl8712_led.c by removing duplicates condition checks.
>
> Signed-off-by: Claudiu Beznea <claudiu.beznea@gmail.com>
> ---
> 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)))
The above hunk messes up the alignment of the if statement. Observe the
alignment of the stuff you are removing. It is correct.
Other than the alignment above, the rest of the patch is correct.
Larry
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-03-11 18:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-03-09 21:54 [PATCH] staging: rtl8712: added few code enhancements in rtl8712_led.c Claudiu Beznea
2016-03-11 18:19 ` Larry Finger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®