staging: rtl8188eu: remove empty if statement in rtw_led.c
PATCH v2 1/2 staging: rtl8188eu: remove empty if statement in rtw_led.c
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.
---
v2: changed patch 1/2 that was wrong.
drivers/staging/rtl8188eu/core/rtw_led.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/rtl8188eu/core/rtw_led.c +3 -3
@@ -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) {
Signature · 1 line
2.18.0
PATCH v2 2/2 staging: rtl8188eu: remove unnecessary parentheses in rtw_led.c
Remove unnecessary parentheses from conditionals. Also clears 'Alignment should match open parenthesis' checkpatch issue.
--- drivers/staging/rtl8188eu/core/rtw_led.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/staging/rtl8188eu/core/rtw_led.c +4 -4
@@ -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 &&
Signature · 1 line
2.18.0
Quoted 3 lines · Dan Carpenter
Thanks.
Reviewed-by Dan Carpenter <[email protected]>
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(-)
drivers/staging/rtl8188eu/core/rtw_led.c +27 -26
@@ -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 :
Quoted 9 lines · Joe Perches
Quoted 3 lines · Dan Carpenter
Thanks.
Reviewed-by Dan Carpenter <[email protected]>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.
Quoted 70 lines
--- drivers/staging/rtl8188eu/core/rtw_led.c | 53 ++++++++++++++++---------------- 1 file changed, 27 insertions(+), 26 deletions(-)drivers/staging/rtl8188eu/core/rtw_led.c +27
-26@@ -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 :