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>

diff --git a/drivers/staging/bcm/led_control.c b/drivers/staging/bcm/led_control.c
index 8e6bb6b64e61f8eb8ceb31b54a463d092eb97c6b..835367780a8aa96bf4b413480750bde1901149e5 100644 (file)
--- 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) &&