iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Staging: bcm: led_control.c: Replaced nested ifs with logical AND concatenation

Browse Source 
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Matthias Beyer 2014-06-23 21:18:31 +02:00 committed by Greg Kroah-Hartman
parent 2d2ea21655
commit f4367dfe0c
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/staging/bcm/led_control.c
View File

@ -630,15 +630,14 @@ static INT BcmGetGPIOPinInfo(struct bcm_mini_adapter *Adapter,
if (((currdriverstate == NORMAL_OPERATION) ||
(currdriverstate == IDLEMODE_EXIT) ||
(currdriverstate == FW_DOWNLOAD)) &&
(led_state_info->LED_Blink_State & currdriverstate)) {
if (led_state_info->GPIO_Num != DISABLE_GPIO_NUM) {
if (*GPIO_num_tx == DISABLE_GPIO_NUM) {
*GPIO_num_tx = led_state_info->GPIO_Num;
*uiLedTxIndex = uiIndex;
} else {
*GPIO_num_rx = led_state_info->GPIO_Num;
*uiLedRxIndex = uiIndex;
}
(led_state_info->LED_Blink_State & currdriverstate) &&
(led_state_info->GPIO_Num != DISABLE_GPIO_NUM)) {
if (*GPIO_num_tx == DISABLE_GPIO_NUM) {
*GPIO_num_tx = led_state_info->GPIO_Num;
*uiLedTxIndex = uiIndex;
} else {
*GPIO_num_rx = led_state_info->GPIO_Num;
*uiLedRxIndex = uiIndex;
}
} else {
if ((led_state_info->LED_On_State & currdriverstate) &&