* [PATCH v2 1/2] staging: rtl8188eu: remove empty if statement in rtw_led.c
@ 2018-09-05 18:44 Michael Straube
2018-09-05 18:44 ` [PATCH v2 2/2] staging: rtl8188eu: remove unnecessary parentheses " Michael Straube
2018-09-06 10:32 ` [PATCH v2 1/2] staging: rtl8188eu: remove empty if statement " Dan Carpenter
0 siblings, 2 replies; 5+ messages in thread
From: Michael Straube @ 2018-09-05 18:44 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-kernel, Michael Straube
Remove emtpy if statement from 'if - else if' by moving
all conditions into a single if. Also clears a line over
80 characters checkpatch warning.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
v2: changed patch 1/2 that was wrong.
drivers/staging/rtl8188eu/core/rtw_led.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_led.c b/drivers/staging/rtl8188eu/core/rtw_led.c
index cbef871a7679..a4d10fc5d3bb 100644
--- a/drivers/staging/rtl8188eu/core/rtw_led.c
+++ b/drivers/staging/rtl8188eu/core/rtw_led.c
@@ -290,9 +290,9 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAct
}
break;
case LED_CTL_SITE_SURVEY:
- if ((pmlmepriv->LinkDetectInfo.bBusyTraffic) && (check_fwstate(pmlmepriv, _FW_LINKED))) {
- ;
- } else if (!pLed->bLedScanBlinkInProgress) {
+ if ((!pmlmepriv->LinkDetectInfo.bBusyTraffic ||
+ !check_fwstate(pmlmepriv, _FW_LINKED)) &&
+ !pLed->bLedScanBlinkInProgress) {
if (IS_LED_WPS_BLINKING(pLed))
return;
if (pLed->bLedNoLinkBlinkInProgress) {
--
2.18.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH v2 2/2] staging: rtl8188eu: remove unnecessary parentheses in rtw_led.c
2018-09-05 18:44 [PATCH v2 1/2] staging: rtl8188eu: remove empty if statement in rtw_led.c Michael Straube
@ 2018-09-05 18:44 ` Michael Straube
2018-09-06 10:32 ` [PATCH v2 1/2] staging: rtl8188eu: remove empty if statement " Dan Carpenter
1 sibling, 0 replies; 5+ messages in thread
From: Michael Straube @ 2018-09-05 18:44 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-kernel, Michael Straube
Remove unnecessary parentheses from conditionals.
Also clears 'Alignment should match open parenthesis'
checkpatch issue.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/rtl8188eu/core/rtw_led.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_led.c b/drivers/staging/rtl8188eu/core/rtw_led.c
index a4d10fc5d3bb..18d5e422a769 100644
--- a/drivers/staging/rtl8188eu/core/rtw_led.c
+++ b/drivers/staging/rtl8188eu/core/rtw_led.c
@@ -18,7 +18,7 @@ static void BlinkTimerCallback(struct timer_list *t)
struct LED_871x *pLed = from_timer(pLed, t, BlinkTimer);
struct adapter *padapter = pLed->padapter;
- if ((padapter->bSurpriseRemoved) || (padapter->bDriverStopped))
+ if (padapter->bSurpriseRemoved || padapter->bDriverStopped)
return;
schedule_work(&pLed->BlinkWorkItem);
@@ -457,7 +457,7 @@ void BlinkHandler(struct LED_871x *pLed)
{
struct adapter *padapter = pLed->padapter;
- if ((padapter->bSurpriseRemoved) || (padapter->bDriverStopped))
+ if (padapter->bSurpriseRemoved || padapter->bDriverStopped)
return;
SwLedBlink1(pLed);
@@ -465,8 +465,8 @@ void BlinkHandler(struct LED_871x *pLed)
void LedControl8188eu(struct adapter *padapter, enum LED_CTL_MODE LedAction)
{
- if ((padapter->bSurpriseRemoved) || (padapter->bDriverStopped) ||
- (!padapter->hw_init_completed))
+ if (padapter->bSurpriseRemoved || padapter->bDriverStopped ||
+ !padapter->hw_init_completed)
return;
if ((padapter->pwrctrlpriv.rf_pwrstate != rf_on &&
--
2.18.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH v2 1/2] staging: rtl8188eu: remove empty if statement in rtw_led.c
2018-09-05 18:44 [PATCH v2 1/2] staging: rtl8188eu: remove empty if statement in rtw_led.c Michael Straube
2018-09-05 18:44 ` [PATCH v2 2/2] staging: rtl8188eu: remove unnecessary parentheses " Michael Straube
@ 2018-09-06 10:32 ` Dan Carpenter
2018-09-06 10:41 ` Joe Perches
1 sibling, 1 reply; 5+ messages in thread
From: Dan Carpenter @ 2018-09-06 10:32 UTC (permalink / raw)
To: Michael Straube; +Cc: gregkh, devel, linux-kernel
Thanks.
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
regards,
dan carpenter
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2 1/2] staging: rtl8188eu: remove empty if statement in rtw_led.c
2018-09-06 10:32 ` [PATCH v2 1/2] staging: rtl8188eu: remove empty if statement " Dan Carpenter
@ 2018-09-06 10:41 ` Joe Perches
2018-09-07 10:57 ` Michael Straube
0 siblings, 1 reply; 5+ messages in thread
From: Joe Perches @ 2018-09-06 10:41 UTC (permalink / raw)
To: Dan Carpenter, Michael Straube; +Cc: gregkh, devel, linux-kernel
On Thu, 2018-09-06 at 13:32 +0300, Dan Carpenter wrote:
> Thanks.
>
> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Trivial, but these case statement blocks should prefer
unindented blocks instead of reformatting the test.
Perhaps similar to the below for each of the cases:
---
drivers/staging/rtl8188eu/core/rtw_led.c | 53 ++++++++++++++++----------------
1 file changed, 27 insertions(+), 26 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_led.c b/drivers/staging/rtl8188eu/core/rtw_led.c
index cbef871a7679..d9c19c1cda16 100644
--- a/drivers/staging/rtl8188eu/core/rtw_led.c
+++ b/drivers/staging/rtl8188eu/core/rtw_led.c
@@ -290,33 +290,34 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAct
}
break;
case LED_CTL_SITE_SURVEY:
- if ((pmlmepriv->LinkDetectInfo.bBusyTraffic) && (check_fwstate(pmlmepriv, _FW_LINKED))) {
- ;
- } else if (!pLed->bLedScanBlinkInProgress) {
- if (IS_LED_WPS_BLINKING(pLed))
- return;
- if (pLed->bLedNoLinkBlinkInProgress) {
- del_timer_sync(&pLed->BlinkTimer);
- pLed->bLedNoLinkBlinkInProgress = false;
- }
- if (pLed->bLedLinkBlinkInProgress) {
- del_timer_sync(&pLed->BlinkTimer);
- pLed->bLedLinkBlinkInProgress = false;
- }
- if (pLed->bLedBlinkInProgress) {
- del_timer_sync(&pLed->BlinkTimer);
- pLed->bLedBlinkInProgress = false;
- }
- pLed->bLedScanBlinkInProgress = true;
- pLed->CurrLedState = LED_BLINK_SCAN;
- pLed->BlinkTimes = 24;
- if (pLed->bLedOn)
- pLed->BlinkingLedState = RTW_LED_OFF;
- else
- pLed->BlinkingLedState = RTW_LED_ON;
- mod_timer(&pLed->BlinkTimer, jiffies +
- msecs_to_jiffies(LED_BLINK_SCAN_INTERVAL_ALPHA));
+ if (pmlmepriv->LinkDetectInfo.bBusyTraffic &&
+ check_fwstate(pmlmepriv, _FW_LINKED))
+ break;
+ if (pLed->bLedScanBlinkInProgress)
+ break;
+ if (IS_LED_WPS_BLINKING(pLed))
+ return;
+ if (pLed->bLedNoLinkBlinkInProgress) {
+ del_timer_sync(&pLed->BlinkTimer);
+ pLed->bLedNoLinkBlinkInProgress = false;
+ }
+ if (pLed->bLedLinkBlinkInProgress) {
+ del_timer_sync(&pLed->BlinkTimer);
+ pLed->bLedLinkBlinkInProgress = false;
+ }
+ if (pLed->bLedBlinkInProgress) {
+ del_timer_sync(&pLed->BlinkTimer);
+ pLed->bLedBlinkInProgress = false;
}
+ pLed->bLedScanBlinkInProgress = true;
+ pLed->CurrLedState = LED_BLINK_SCAN;
+ pLed->BlinkTimes = 24;
+ if (pLed->bLedOn)
+ pLed->BlinkingLedState = RTW_LED_OFF;
+ else
+ pLed->BlinkingLedState = RTW_LED_ON;
+ mod_timer(&pLed->BlinkTimer, jiffies +
+ msecs_to_jiffies(LED_BLINK_SCAN_INTERVAL_ALPHA));
break;
case LED_CTL_TX:
case LED_CTL_RX:
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH v2 1/2] staging: rtl8188eu: remove empty if statement in rtw_led.c
2018-09-06 10:41 ` Joe Perches
@ 2018-09-07 10:57 ` Michael Straube
0 siblings, 0 replies; 5+ messages in thread
From: Michael Straube @ 2018-09-07 10:57 UTC (permalink / raw)
To: Joe Perches, Dan Carpenter; +Cc: gregkh, devel, linux-kernel
On 9/6/18 12:41 PM, Joe Perches wrote:
> On Thu, 2018-09-06 at 13:32 +0300, Dan Carpenter wrote:
>> Thanks.
>>
>> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
>
> Trivial, but these case statement blocks should prefer
> unindented blocks instead of reformatting the test.
>
> Perhaps similar to the below for each of the cases:
That sounds good to me. I will send a patch with Joe's
suggestions, thanks. It will also solve some lines too
long warnings. :)
So, please do not merge this series.
> ---
> drivers/staging/rtl8188eu/core/rtw_led.c | 53 ++++++++++++++++----------------
> 1 file changed, 27 insertions(+), 26 deletions(-)
>
> diff --git a/drivers/staging/rtl8188eu/core/rtw_led.c b/drivers/staging/rtl8188eu/core/rtw_led.c
> index cbef871a7679..d9c19c1cda16 100644
> --- a/drivers/staging/rtl8188eu/core/rtw_led.c
> +++ b/drivers/staging/rtl8188eu/core/rtw_led.c
> @@ -290,33 +290,34 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAct
> }
> break;
> case LED_CTL_SITE_SURVEY:
> - if ((pmlmepriv->LinkDetectInfo.bBusyTraffic) && (check_fwstate(pmlmepriv, _FW_LINKED))) {
> - ;
> - } else if (!pLed->bLedScanBlinkInProgress) {
> - if (IS_LED_WPS_BLINKING(pLed))
> - return;
> - if (pLed->bLedNoLinkBlinkInProgress) {
> - del_timer_sync(&pLed->BlinkTimer);
> - pLed->bLedNoLinkBlinkInProgress = false;
> - }
> - if (pLed->bLedLinkBlinkInProgress) {
> - del_timer_sync(&pLed->BlinkTimer);
> - pLed->bLedLinkBlinkInProgress = false;
> - }
> - if (pLed->bLedBlinkInProgress) {
> - del_timer_sync(&pLed->BlinkTimer);
> - pLed->bLedBlinkInProgress = false;
> - }
> - pLed->bLedScanBlinkInProgress = true;
> - pLed->CurrLedState = LED_BLINK_SCAN;
> - pLed->BlinkTimes = 24;
> - if (pLed->bLedOn)
> - pLed->BlinkingLedState = RTW_LED_OFF;
> - else
> - pLed->BlinkingLedState = RTW_LED_ON;
> - mod_timer(&pLed->BlinkTimer, jiffies +
> - msecs_to_jiffies(LED_BLINK_SCAN_INTERVAL_ALPHA));
> + if (pmlmepriv->LinkDetectInfo.bBusyTraffic &&
> + check_fwstate(pmlmepriv, _FW_LINKED))
> + break;
> + if (pLed->bLedScanBlinkInProgress)
> + break;
> + if (IS_LED_WPS_BLINKING(pLed))
> + return;
> + if (pLed->bLedNoLinkBlinkInProgress) {
> + del_timer_sync(&pLed->BlinkTimer);
> + pLed->bLedNoLinkBlinkInProgress = false;
> + }
> + if (pLed->bLedLinkBlinkInProgress) {
> + del_timer_sync(&pLed->BlinkTimer);
> + pLed->bLedLinkBlinkInProgress = false;
> + }
> + if (pLed->bLedBlinkInProgress) {
> + del_timer_sync(&pLed->BlinkTimer);
> + pLed->bLedBlinkInProgress = false;
> }
> + pLed->bLedScanBlinkInProgress = true;
> + pLed->CurrLedState = LED_BLINK_SCAN;
> + pLed->BlinkTimes = 24;
> + if (pLed->bLedOn)
> + pLed->BlinkingLedState = RTW_LED_OFF;
> + else
> + pLed->BlinkingLedState = RTW_LED_ON;
> + mod_timer(&pLed->BlinkTimer, jiffies +
> + msecs_to_jiffies(LED_BLINK_SCAN_INTERVAL_ALPHA));
> break;
> case LED_CTL_TX:
> case LED_CTL_RX:
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-09-07 10:57 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-09-05 18:44 [PATCH v2 1/2] staging: rtl8188eu: remove empty if statement in rtw_led.c Michael Straube
2018-09-05 18:44 ` [PATCH v2 2/2] staging: rtl8188eu: remove unnecessary parentheses " Michael Straube
2018-09-06 10:32 ` [PATCH v2 1/2] staging: rtl8188eu: remove empty if statement " Dan Carpenter
2018-09-06 10:41 ` Joe Perches
2018-09-07 10:57 ` Michael Straube
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.