From: Matthias Beyer <mail@beyermatthias.de>
Date: Mon, 23 Jun 2014 19:18:31 +0000 (+0200)
Subject: Staging: bcm: led_control.c: Replaced nested ifs with logical AND concatenation
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=f4367dfe0c0056b1efef1758f5a11cadec66013e;p=deliverable%2Flinux.git

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 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) &&