Skip to content

L
linux
Commit 00585495 authored by Michael Straube's avatar Michael Straube Committed by Greg Kroah-Hartman
Browse files
Options

staging: rtl8188eu: refactor SwLedControlMode1() 

Refactor switch cases in SwLedControlMode1() to reduce
indentation level. Also clears line over 80 characters
checkpatch warnings.
Suggested-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarMichael Straube <straube.linux@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7aaaabd5
Hide whitespace changes
Inline Side-by-side
Showing with 113 additions and 110 deletions
drivers/staging/rtl8188eu/core/rtw_led.c
View file @ 00585495
...@@ -245,131 +245,134 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAct ...@@ -245,131 +245,134 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAct
case LED_CTL_POWER_ON: case LED_CTL_POWER_ON:
case LED_CTL_START_TO_LINK: case LED_CTL_START_TO_LINK:
case LED_CTL_NO_LINK: case LED_CTL_NO_LINK:
if (!pLed->bLedNoLinkBlinkInProgress) { if (pLed->bLedNoLinkBlinkInProgress)
if (pLed->CurrLedState == LED_BLINK_SCAN || IS_LED_WPS_BLINKING(pLed)) break;
return; if (pLed->CurrLedState == LED_BLINK_SCAN ||
if (pLed->bLedLinkBlinkInProgress) { IS_LED_WPS_BLINKING(pLed))
del_timer_sync(&pLed->BlinkTimer); return;
pLed->bLedLinkBlinkInProgress = false; if (pLed->bLedLinkBlinkInProgress) {
} del_timer_sync(&pLed->BlinkTimer);
if (pLed->bLedBlinkInProgress) { pLed->bLedLinkBlinkInProgress = false;
del_timer_sync(&pLed->BlinkTimer); }
pLed->bLedBlinkInProgress = 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));
} }
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; break;
case LED_CTL_LINK: case LED_CTL_LINK:
if (!pLed->bLedLinkBlinkInProgress) { if (pLed->bLedLinkBlinkInProgress)
if (pLed->CurrLedState == LED_BLINK_SCAN || IS_LED_WPS_BLINKING(pLed)) break;
return; if (pLed->CurrLedState == LED_BLINK_SCAN ||
if (pLed->bLedNoLinkBlinkInProgress) { IS_LED_WPS_BLINKING(pLed))
del_timer_sync(&pLed->BlinkTimer); return;
pLed->bLedNoLinkBlinkInProgress = false; if (pLed->bLedNoLinkBlinkInProgress) {
} del_timer_sync(&pLed->BlinkTimer);
if (pLed->bLedBlinkInProgress) { pLed->bLedNoLinkBlinkInProgress = false;
del_timer_sync(&pLed->BlinkTimer); }
pLed->bLedBlinkInProgress = false; if (pLed->bLedBlinkInProgress) {
} del_timer_sync(&pLed->BlinkTimer);
pLed->bLedLinkBlinkInProgress = true; pLed->bLedBlinkInProgress = false;
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));
} }
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; break;
case LED_CTL_SITE_SURVEY: case LED_CTL_SITE_SURVEY:
if ((pmlmepriv->LinkDetectInfo.bBusyTraffic) && (check_fwstate(pmlmepriv, _FW_LINKED))) { if (pmlmepriv->LinkDetectInfo.bBusyTraffic &&
; check_fwstate(pmlmepriv, _FW_LINKED))
} else if (!pLed->bLedScanBlinkInProgress) { break;
if (IS_LED_WPS_BLINKING(pLed)) if (pLed->bLedScanBlinkInProgress)
return; break;
if (pLed->bLedNoLinkBlinkInProgress) { if (IS_LED_WPS_BLINKING(pLed))
del_timer_sync(&pLed->BlinkTimer); return;
pLed->bLedNoLinkBlinkInProgress = false; if (pLed->bLedNoLinkBlinkInProgress) {
} del_timer_sync(&pLed->BlinkTimer);
if (pLed->bLedLinkBlinkInProgress) { pLed->bLedNoLinkBlinkInProgress = false;
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 (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; break;
case LED_CTL_TX: case LED_CTL_TX:
case LED_CTL_RX: case LED_CTL_RX:
if (!pLed->bLedBlinkInProgress) { if (pLed->bLedBlinkInProgress)
if (pLed->CurrLedState == LED_BLINK_SCAN || IS_LED_WPS_BLINKING(pLed)) break;
return; if (pLed->CurrLedState == LED_BLINK_SCAN ||
if (pLed->bLedNoLinkBlinkInProgress) { IS_LED_WPS_BLINKING(pLed))
del_timer_sync(&pLed->BlinkTimer); return;
pLed->bLedNoLinkBlinkInProgress = false; if (pLed->bLedNoLinkBlinkInProgress) {
} del_timer_sync(&pLed->BlinkTimer);
if (pLed->bLedLinkBlinkInProgress) { pLed->bLedNoLinkBlinkInProgress = false;
del_timer_sync(&pLed->BlinkTimer); }
pLed->bLedLinkBlinkInProgress = false; if (pLed->bLedLinkBlinkInProgress) {
} del_timer_sync(&pLed->BlinkTimer);
pLed->bLedBlinkInProgress = true; pLed->bLedLinkBlinkInProgress = false;
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));
} }
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; break;
case LED_CTL_START_WPS: /* wait until xinpin finish */ case LED_CTL_START_WPS: /* wait until xinpin finish */
case LED_CTL_START_WPS_BOTTON: case LED_CTL_START_WPS_BOTTON:
if (!pLed->bLedWPSBlinkInProgress) { if (pLed->bLedWPSBlinkInProgress)
if (pLed->bLedNoLinkBlinkInProgress) { break;
del_timer_sync(&pLed->BlinkTimer); if (pLed->bLedNoLinkBlinkInProgress) {
pLed->bLedNoLinkBlinkInProgress = false; 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->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; break;
case LED_CTL_STOP_WPS: case LED_CTL_STOP_WPS:
if (pLed->bLedNoLinkBlinkInProgress) { if (pLed->bLedNoLinkBlinkInProgress) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7