staging: rtl8188eu: refactor SwLedControlMode1()
PATCH 1/3 staging: rtl8188eu: refactor SwLedControlMode1()
Refactor switch cases in SwLedControlMode1() to reduce indentation level. Also clears line over 80 characters checkpatch warnings.
Suggested-by Joe Perches <[email protected]>
Signed-off-by Michael Straube <[email protected]>
--- drivers/staging/rtl8188eu/core/rtw_led.c | 223 ++++++++++++----------- 1 file changed, 113 insertions(+), 110 deletions(-)
drivers/staging/rtl8188eu/core/rtw_led.c +113 -110
@@ -245,131 +245,134 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedActcase LED_CTL_POWER_ON :case LED_CTL_START_TO_LINK :case LED_CTL_NO_LINK : -if (!pLed->bLedNoLinkBlinkInProgress) { -if (pLed->CurrLedState ==LED_BLINK_SCAN ||IS_LED_WPS_BLINKING (pLed)) -return ; -if (pLed->bLedLinkBlinkInProgress) { -del_timer_sync (&pLed->BlinkTimer); - pLed->bLedLinkBlinkInProgress = false; - } -if (pLed->bLedBlinkInProgress) { -del_timer_sync (&pLed->BlinkTimer); - pLed->bLedBlinkInProgress = false; - } - - pLed->bLedNoLinkBlinkInProgress = true; - pLed->CurrLedState =LED_BLINK_SLOWLY ; -if (pLed->bLedOn) - pLed->BlinkingLedState =RTW_LED_OFF ; -else - pLed->BlinkingLedState =RTW_LED_ON ; -mod_timer (&pLed->BlinkTimer, jiffies + -msecs_to_jiffies (LED_BLINK_NO_LINK_INTERVAL_ALPHA )); +if (pLed->bLedNoLinkBlinkInProgress) +break ; +if (pLed->CurrLedState ==LED_BLINK_SCAN || +IS_LED_WPS_BLINKING (pLed)) +return ; +if (pLed->bLedLinkBlinkInProgress) { +del_timer_sync (&pLed->BlinkTimer); + pLed->bLedLinkBlinkInProgress = false; + } +if (pLed->bLedBlinkInProgress) { +del_timer_sync (&pLed->BlinkTimer); + pLed->bLedBlinkInProgress = false; } + pLed->bLedNoLinkBlinkInProgress = true; + pLed->CurrLedState =LED_BLINK_SLOWLY ; +if (pLed->bLedOn) + pLed->BlinkingLedState =RTW_LED_OFF ; +else + pLed->BlinkingLedState =RTW_LED_ON ; +mod_timer (&pLed->BlinkTimer, jiffies + +msecs_to_jiffies (LED_BLINK_NO_LINK_INTERVAL_ALPHA ));break ;case LED_CTL_LINK : -if (!pLed->bLedLinkBlinkInProgress) { -if (pLed->CurrLedState ==LED_BLINK_SCAN ||IS_LED_WPS_BLINKING (pLed)) -return ; -if (pLed->bLedNoLinkBlinkInProgress) { -del_timer_sync (&pLed->BlinkTimer); - pLed->bLedNoLinkBlinkInProgress = false; - } -if (pLed->bLedBlinkInProgress) { -del_timer_sync (&pLed->BlinkTimer); - pLed->bLedBlinkInProgress = false; - } - pLed->bLedLinkBlinkInProgress = true; - pLed->CurrLedState =LED_BLINK_NORMAL ; -if (pLed->bLedOn) - pLed->BlinkingLedState =RTW_LED_OFF ; -else - pLed->BlinkingLedState =RTW_LED_ON ; -mod_timer (&pLed->BlinkTimer, jiffies + -msecs_to_jiffies (LED_BLINK_LINK_INTERVAL_ALPHA )); +if (pLed->bLedLinkBlinkInProgress) +break ; +if (pLed->CurrLedState ==LED_BLINK_SCAN || +IS_LED_WPS_BLINKING (pLed)) +return ; +if (pLed->bLedNoLinkBlinkInProgress) { +del_timer_sync (&pLed->BlinkTimer); + pLed->bLedNoLinkBlinkInProgress = false; + } +if (pLed->bLedBlinkInProgress) { +del_timer_sync (&pLed->BlinkTimer); + pLed->bLedBlinkInProgress = false; } + pLed->bLedLinkBlinkInProgress = true; + pLed->CurrLedState =LED_BLINK_NORMAL ; +if (pLed->bLedOn) + pLed->BlinkingLedState =RTW_LED_OFF ; +else + pLed->BlinkingLedState =RTW_LED_ON ; +mod_timer (&pLed->BlinkTimer, jiffies + +msecs_to_jiffies (LED_BLINK_LINK_INTERVAL_ALPHA ));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 : -if (!pLed->bLedBlinkInProgress) { -if (pLed->CurrLedState ==LED_BLINK_SCAN ||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; - } - pLed->bLedBlinkInProgress = true; - pLed->CurrLedState =LED_BLINK_TXRX ; - pLed->BlinkTimes =2 ; -if (pLed->bLedOn) - pLed->BlinkingLedState =RTW_LED_OFF ; -else - pLed->BlinkingLedState =RTW_LED_ON ; -mod_timer (&pLed->BlinkTimer, jiffies + -msecs_to_jiffies (LED_BLINK_FASTER_INTERVAL_ALPHA )); +if (pLed->bLedBlinkInProgress) +break ; +if (pLed->CurrLedState ==LED_BLINK_SCAN || +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; } + pLed->bLedBlinkInProgress = true; + pLed->CurrLedState =LED_BLINK_TXRX ; + pLed->BlinkTimes =2 ; +if (pLed->bLedOn) + pLed->BlinkingLedState =RTW_LED_OFF ; +else + pLed->BlinkingLedState =RTW_LED_ON ; +mod_timer (&pLed->BlinkTimer, jiffies + +msecs_to_jiffies (LED_BLINK_FASTER_INTERVAL_ALPHA ));break ;case LED_CTL_START_WPS :/* wait until xinpin finish */ case LED_CTL_START_WPS_BOTTON : -if (!pLed->bLedWPSBlinkInProgress) { -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; - } -if (pLed->bLedScanBlinkInProgress) { -del_timer_sync (&pLed->BlinkTimer); - pLed->bLedScanBlinkInProgress = false; - } - pLed->bLedWPSBlinkInProgress = true; - pLed->CurrLedState =LED_BLINK_WPS ; -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 (pLed->bLedWPSBlinkInProgress) +break ; +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; + } +if (pLed->bLedScanBlinkInProgress) { +del_timer_sync (&pLed->BlinkTimer); + pLed->bLedScanBlinkInProgress = false; + } + pLed->bLedWPSBlinkInProgress = true; + pLed->CurrLedState =LED_BLINK_WPS ; +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_STOP_WPS :if (pLed->bLedNoLinkBlinkInProgress) {
Signature · 1 line
2.18.0
PATCH 2/3 staging: rtl8188eu: remove unnecessary parentheses in rtw_led.c
Remove unnecessary parentheses from conditionals. Also clears 'Alignment should match open parenthesis' checkpatch issue.
Signed-off-by Michael Straube <[email protected]>
--- 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);
@@ -460,7 +460,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);
@@ -468,8 +468,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
PATCH 3/3 staging: rtl8188eu: fix lines over 80 characters in rtw_led.c
In reply to Michael StraubeWrap lines over 80 characters where appropriate to clear checkpatch warnings.
Signed-off-by Michael Straube <[email protected]>
--- drivers/staging/rtl8188eu/core/rtw_led.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/staging/rtl8188eu/core/rtw_led.c +6 -3
@@ -95,10 +95,12 @@ static void SwLedBlink1(struct LED_871x *pLed)/* Change LED according to BlinkingLedState specified. */ if (pLed->BlinkingLedState ==RTW_LED_ON ) {SwLedOn (padapter, pLed); -RT_TRACE (_module_rtl8712_led_c_, _drv_info_, ("Blinktimes (%d): turn on\n" , pLed->BlinkTimes)); +RT_TRACE (_module_rtl8712_led_c_, _drv_info_, + ("Blinktimes (%d): turn on\n" , pLed->BlinkTimes)); }else {SwLedOff (padapter, pLed); -RT_TRACE (_module_rtl8712_led_c_, _drv_info_, ("Blinktimes (%d): turn off\n" , pLed->BlinkTimes)); +RT_TRACE (_module_rtl8712_led_c_, _drv_info_, + ("Blinktimes (%d): turn off\n" , pLed->BlinkTimes)); }if (padapter->pwrctrlpriv.rf_pwrstate != rf_on) {
@@ -449,7 +451,8 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedActbreak ; } -RT_TRACE (_module_rtl8712_led_c_, _drv_info_, ("Led %d\n" , pLed->CurrLedState)); +RT_TRACE (_module_rtl8712_led_c_, _drv_info_, + ("Led %d\n" , pLed->CurrLedState)); }/* */
Signature · 1 line
2.18.0