Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4367dfe authored by Matthias Beyer's avatar Matthias Beyer Committed by Greg Kroah-Hartman
Browse files

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



Signed-off-by: default avatarMatthias Beyer <mail@beyermatthias.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2d2ea216

drivers/staging/bcm/led_control.c

+8 −9
Original line number Diff line number Diff line
@@ -630,8 +630,8 @@ 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) {

		    (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;
@@ -639,7 +639,6 @@ static INT BcmGetGPIOPinInfo(struct bcm_mini_adapter *Adapter, 
				*GPIO_num_rx = led_state_info->GPIO_Num;

				*uiLedRxIndex = uiIndex;

			}

			}

		} else {

			if ((led_state_info->LED_On_State & currdriverstate) &&

			    (led_state_info->GPIO_Num != DISABLE_GPIO_NUM)) {