diff options
| author |   Matthias Beyer <mail@beyermatthias.de> | 2014-06-23 21:18:31 +0200 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-06-26 21:02:14 -0400 |
| commit | f4367dfe0c0056b1efef1758f5a11cadec66013e (patch) | |
| tree | 709ebd326fa4d019825334586c5dabfcc1c4f4bd | |
| parent | Staging: bcm: led_control.c: Replaced member accessing by variable (diff) | |
Staging: bcm: led_control.c: Replaced nested ifs with logical AND concatenation
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/bcm/led_control.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/drivers/staging/bcm/led_control.c b/drivers/staging/bcm/led_control.c index 8e6bb6b64e61..835367780a8a 100644 --- a/drivers/staging/bcm/led_control.c +++ b/drivers/staging/bcm/led_control.c @@ -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) && |