commit 7a0304c082e11ce0d2cca6ab74c4cfc952849847
author Matthias Beyer <mail@beyermatthias.de> Mon Jun 23 21:18:20 2014 +0200
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> Thu Jun 26 21:02:13 2014 -0400
tree e90cead0eef3e26fe3fb8e76831b4bbae585a0fc
parent a1082a4d5ee83a1f72db9e5b656f570efa432759

Staging: bcm: led_control.c: Simplified nested if conditions

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

drivers/staging/bcm/led_control.c

diff --git a/drivers/staging/bcm/led_control.c b/drivers/staging/bcm/led_control.c
index 612e61e..f528a45 100644
--- a/drivers/staging/bcm/led_control.c
+++ b/drivers/staging/bcm/led_control.c
@@ -632,30 +632,28 @@
 
 	for (uiIndex = 0; uiIndex < NUM_OF_LEDS; uiIndex++) {
 
-		if ((currdriverstate == NORMAL_OPERATION) ||
-				(currdriverstate == IDLEMODE_EXIT) ||
-				(currdriverstate == FW_DOWNLOAD)) {
-			if (Adapter->LEDInfo.LEDState[uiIndex].LED_Blink_State &
-					currdriverstate) {
-				if (Adapter->LEDInfo.LEDState[uiIndex].GPIO_Num
-						!= DISABLE_GPIO_NUM) {
-					if (*GPIO_num_tx == DISABLE_GPIO_NUM) {
-						*GPIO_num_tx = Adapter->LEDInfo.LEDState[uiIndex].GPIO_Num;
-						*uiLedTxIndex = uiIndex;
-					} else {
-						*GPIO_num_rx = Adapter->LEDInfo.LEDState[uiIndex].GPIO_Num;
-						*uiLedRxIndex = uiIndex;
-					}
+		if (((currdriverstate == NORMAL_OPERATION) ||
+			(currdriverstate == IDLEMODE_EXIT) ||
+			(currdriverstate == FW_DOWNLOAD)) &&
+		    (Adapter->LEDInfo.LEDState[uiIndex].LED_Blink_State &
+					currdriverstate)) {
+			if (Adapter->LEDInfo.LEDState[uiIndex].GPIO_Num
+					!= DISABLE_GPIO_NUM) {
+				if (*GPIO_num_tx == DISABLE_GPIO_NUM) {
+					*GPIO_num_tx = Adapter->LEDInfo.LEDState[uiIndex].GPIO_Num;
+					*uiLedTxIndex = uiIndex;
+				} else {
+					*GPIO_num_rx = Adapter->LEDInfo.LEDState[uiIndex].GPIO_Num;
+					*uiLedRxIndex = uiIndex;
 				}
 			}
 		} else {
-			if (Adapter->LEDInfo.LEDState[uiIndex].LED_On_State
-					& currdriverstate) {
-				if (Adapter->LEDInfo.LEDState[uiIndex].GPIO_Num
-						!= DISABLE_GPIO_NUM) {
-					*GPIO_num_tx = Adapter->LEDInfo.LEDState[uiIndex].GPIO_Num;
-					*uiLedTxIndex = uiIndex;
-				}
+			if ((Adapter->LEDInfo.LEDState[uiIndex].LED_On_State &
+						currdriverstate) &&
+			    (Adapter->LEDInfo.LEDState[uiIndex].GPIO_Num !=
+			     DISABLE_GPIO_NUM)) {
+				*GPIO_num_tx = Adapter->LEDInfo.LEDState[uiIndex].GPIO_Num;
+				*uiLedTxIndex = uiIndex;
 			}
 		}
 	}