staging: rtl8188eu: remove empty if statement in rtw_led.c
PATCH 1/2 staging: rtl8188eu: remove empty if statement in rtw_led.c
Remove empty if statement from 'if - else if' and replace the else if with if. Remove the now unused variable pmlmepriv. Also clears line over 80 characters and CamelCase checkpatch issues.
--- drivers/staging/rtl8188eu/core/rtw_led.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/staging/rtl8188eu/core/rtw_led.c +1 -4
@@ -239,7 +239,6 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAct {struct led_priv *ledpriv = &padapter->ledpriv;struct LED_871x *pLed = &ledpriv->SwLed0; -struct mlme_priv *pmlmepriv = &padapter->mlmepriv;switch (LedAction) {case LED_CTL_POWER_ON :
@@ -290,9 +289,7 @@ 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 (!pLed->bLedScanBlinkInProgress) {if (IS_LED_WPS_BLINKING (pLed))return ;if (pLed->bLedNoLinkBlinkInProgress) {
Signature · 1 line
2.18.0
PATCH 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);
@@ -454,7 +454,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);
@@ -462,8 +462,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 23 lines · Michael Straube
Remove empty if statement from 'if - else if' and replace the else if with if. Remove the now unused variable pmlmepriv. Also clears line over 80 characters and CamelCase checkpatch issues.
Signed-off-by Michael Straube <[email protected]>--- drivers/staging/rtl8188eu/core/rtw_led.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)drivers/staging/rtl8188eu/core/rtw_led.c +0
-1@@ -239,7 +239,6 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAct {struct led_priv *ledpriv = &padapter->ledpriv;struct LED_871x *pLed = &ledpriv->SwLed0; -struct mlme_priv *pmlmepriv = &padapter->mlmepriv;switch (LedAction) {case LED_CTL_POWER_ON :
drivers/staging/rtl8188eu/core/rtw_led.c static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAct · line 292
Quoted 7 lines
drivers/staging/rtl8188eu/core/rtw_led.c +1
-3@@ -290,9 +289,7 @@ 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 (!pLed->bLedScanBlinkInProgress) {
I think you have introduced a bug...
regards,
dan carpenter
Quoted 9 lines · Dan Carpenter
drivers/staging/rtl8188eu/core/rtw_led.c static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAct · line 292
Quoted 6 lines · Michael Straube
case
LED_CTL_SITE_SURVEY:drivers/staging/rtl8188eu/core/rtw_led.c +1
-3-if ((pmlmepriv->LinkDetectInfo.bBusyTraffic) && (check_fwstate (pmlmepriv, _FW_LINKED))) { - ; - }else if (!pLed->bLedScanBlinkInProgress) { +if (!pLed->bLedScanBlinkInProgress) {I think you have introduced a bug...
Ah yes I see now, thanks.
Would it be ok to merge the conditions in a single if?
if ((!pmlmepriv->LinkDetectInfo.bBusyTraffic ||
!check_fwstate(pmlmepriv, _FW_LINKED)) &&
!pLed->bLedScanBlinkInProgress) {regards,
Michael
Quoted 11 lines · Michael Straube
Quoted 9 lines · Dan Carpenter
drivers/staging/rtl8188eu/core/rtw_led.c static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAct · line 292
Quoted 6 lines · Michael Straube
case
LED_CTL_SITE_SURVEY:drivers/staging/rtl8188eu/core/rtw_led.c +1
-3-if ((pmlmepriv->LinkDetectInfo.bBusyTraffic) && (check_fwstate (pmlmepriv, _FW_LINKED))) { - ; - }else if (!pLed->bLedScanBlinkInProgress) { +if (!pLed->bLedScanBlinkInProgress) {I think you have introduced a bug...
Quoted 5 lines
Ah yes I see now, thanks.
Would it be ok to merge the conditions in a single if?if ((!pmlmepriv->LinkDetectInfo.bBusyTraffic ||
!check_fwstate(pmlmepriv, _FW_LINKED)) &&
^
Put an extra space here because it's inside the inner parens.
Quoted 1 line
!pLed->bLedScanBlinkInProgress) {So it would be aligned like so:
if ((!pmlmepriv->LinkDetectInfo.bBusyTraffic ||
!check_fwstate(pmlmepriv, _FW_LINKED)) &&
!pLed->bLedScanBlinkInProgress) {regards,
dan capenter