From: Aaro Koskinen <aaro.koskinen@iki.fi>
Date: Fri, 26 Feb 2016 00:13:55 +0000 (+0200)
Subject: staging: octeon-usb: simplify if statement
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=284ea26aaaceeb251b350d78faa19ecd2fa450ce;p=deliverable%2Flinux.git

staging: octeon-usb: simplify if statement

Simplify if statement to avoid deep nesting.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/octeon-usb/octeon-hcd.c b/drivers/staging/octeon-usb/octeon-hcd.c
index 726ec5d5013f..39854ab09e32 100644
--- a/drivers/staging/octeon-usb/octeon-hcd.c
+++ b/drivers/staging/octeon-usb/octeon-hcd.c
@@ -2768,26 +2768,23 @@ static int cvmx_usb_poll_channel(struct cvmx_usb_state *usb, int channel)
 			 */
 			if (cvmx_usb_pipe_needs_split(usb, pipe)) {
 				if (transaction->stage ==
-				    CVMX_USB_STAGE_NON_CONTROL)
+				    CVMX_USB_STAGE_NON_CONTROL) {
 					transaction->stage =
 						CVMX_USB_STAGE_NON_CONTROL_SPLIT_COMPLETE;
-				else {
-					if (buffer_space_left &&
-					    (bytes_in_last_packet ==
-					     pipe->max_packet))
-						transaction->stage =
-							CVMX_USB_STAGE_NON_CONTROL;
-					else {
-						if (transaction->type ==
-						    CVMX_USB_TRANSFER_INTERRUPT)
-							pipe->next_tx_frame +=
-								pipe->interval;
-							cvmx_usb_perform_complete(
-								usb,
-								pipe,
-								transaction,
-								CVMX_USB_COMPLETE_SUCCESS);
-					}
+				} else if (buffer_space_left &&
+					   (bytes_in_last_packet ==
+					   pipe->max_packet)) {
+					transaction->stage =
+						CVMX_USB_STAGE_NON_CONTROL;
+				} else {
+					if (transaction->type ==
+					    CVMX_USB_TRANSFER_INTERRUPT)
+						pipe->next_tx_frame +=
+							pipe->interval;
+					cvmx_usb_perform_complete(usb,
+								  pipe,
+								  transaction,
+								  CVMX_USB_COMPLETE_SUCCESS);
 				}
 			} else {
 				if ((pipe->device_speed ==