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

Commit 68ea3380 authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Greg Kroah-Hartman
Browse files

staging: octeon-usb: align split lines to match open parenthesis 



Align split lines to match open parenthesis.

Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a2fcca42

drivers/staging/octeon-usb/octeon-hcd.c

+81 −89
Original line number Diff line number Diff line
@@ -1643,8 +1643,7 @@ static void cvmx_usb_start_channel(struct cvmx_usb_state *usb, int channel, 
			 * begin/middle/end of the data or all

			 */

			if (!usbc_hcsplt.s.compsplt &&

				(pipe->transfer_dir ==

				 CVMX_USB_DIRECTION_OUT) &&

			    (pipe->transfer_dir == CVMX_USB_DIRECTION_OUT) &&

			    (pipe->transfer_type ==

			     CVMX_USB_TRANSFER_ISOCHRONOUS)) {

				/*
@@ -1822,7 +1821,9 @@ static void cvmx_usb_start_channel(struct cvmx_usb_state *usb, int channel, 
	{

		union cvmx_usbcx_hctsizx usbc_hctsiz = { .u32 =

			cvmx_usb_read_csr32(usb,

				CVMX_USBCX_HCTSIZX(channel, usb->index))};

					    CVMX_USBCX_HCTSIZX(channel,

							       usb->index))

		};

		transaction->xfersize = usbc_hctsiz.s.xfersize;

		transaction->pktcnt = usbc_hctsiz.s.pktcnt;

	}
@@ -1858,8 +1859,8 @@ static struct cvmx_usb_pipe *cvmx_usb_find_ready_pipe( 
		if (!(pipe->flags & CVMX_USB_PIPE_FLAGS_SCHEDULED) && t &&

		    (pipe->next_tx_frame <= current_frame) &&

		    ((pipe->split_sc_frame == -1) ||

			 ((((int)current_frame - (int)pipe->split_sc_frame)

			   & 0x7f) < 0x40)) &&

		     ((((int)current_frame - pipe->split_sc_frame) & 0x7f) <

		      0x40)) &&

		    (!usb->active_split || (usb->active_split == t))) {

			prefetch(t);

			return pipe;
@@ -1916,24 +1917,20 @@ static void cvmx_usb_schedule(struct cvmx_usb_state *usb, int is_sof) 
			 * beginning of the frame

			 */

			pipe = cvmx_usb_find_ready_pipe(usb,

					usb->active_pipes +

					CVMX_USB_TRANSFER_ISOCHRONOUS,

							usb->active_pipes + CVMX_USB_TRANSFER_ISOCHRONOUS,

							usb->frame_number);

			if (likely(!pipe))

				pipe = cvmx_usb_find_ready_pipe(usb,

						usb->active_pipes +

						CVMX_USB_TRANSFER_INTERRUPT,

								usb->active_pipes + CVMX_USB_TRANSFER_INTERRUPT,

								usb->frame_number);

		}

		if (likely(!pipe)) {

			pipe = cvmx_usb_find_ready_pipe(usb,

					usb->active_pipes +

					CVMX_USB_TRANSFER_CONTROL,

							usb->active_pipes + CVMX_USB_TRANSFER_CONTROL,

							usb->frame_number);

			if (likely(!pipe))

				pipe = cvmx_usb_find_ready_pipe(usb,

						usb->active_pipes +

						CVMX_USB_TRANSFER_BULK,

								usb->active_pipes + CVMX_USB_TRANSFER_BULK,

								usb->frame_number);

		}

		if (!pipe)
@@ -1994,8 +1991,7 @@ static void octeon_usb_urb_complete_callback(struct cvmx_usb_state *usb, 
		/* Recalculate the transfer size by adding up each packet */

		urb->actual_length = 0;

		for (i = 0; i < urb->number_of_packets; i++) {

			if (iso_packet[i].status ==

					CVMX_USB_COMPLETE_SUCCESS) {

			if (iso_packet[i].status == CVMX_USB_COMPLETE_SUCCESS) {

				urb->iso_frame_desc[i].status = 0;

				urb->iso_frame_desc[i].actual_length =

					iso_packet[i].length;
@@ -2459,13 +2455,11 @@ static int cvmx_usb_poll_channel(struct cvmx_usb_state *usb, int channel) 
				hcintmsk.u32 = 0;

				hcintmsk.s.chhltdmsk = 1;

				cvmx_usb_write_csr32(usb,

						CVMX_USBCX_HCINTMSKX(channel,

							usb->index),

						     CVMX_USBCX_HCINTMSKX(channel, usb->index),

						     hcintmsk.u32);

				usbc_hcchar.s.chdis = 1;

				cvmx_usb_write_csr32(usb,

						CVMX_USBCX_HCCHARX(channel,

							usb->index),

						     CVMX_USBCX_HCCHARX(channel, usb->index),

						     usbc_hcchar.u32);

				return 0;

			} else if (usbc_hcint.s.xfercompl) {
@@ -2685,7 +2679,8 @@ static int cvmx_usb_poll_channel(struct cvmx_usb_state *usb, int channel) 
			case CVMX_USB_STAGE_NON_CONTROL_SPLIT_COMPLETE:

				/* This should be impossible */

				cvmx_usb_perform_complete(usb, pipe,

					transaction, CVMX_USB_COMPLETE_ERROR);

							  transaction,

							  CVMX_USB_COMPLETE_ERROR);

				break;

			case CVMX_USB_STAGE_SETUP:

				pipe->pid_toggle = 1;
@@ -2743,8 +2738,7 @@ static int cvmx_usb_poll_channel(struct cvmx_usb_state *usb, int channel) 
				break;

			case CVMX_USB_STAGE_DATA_SPLIT_COMPLETE:

				if ((buffer_space_left == 0) ||

						(bytes_in_last_packet <

						 pipe->max_packet)) {

				    (bytes_in_last_packet < pipe->max_packet)) {

					pipe->pid_toggle = 1;

					transaction->stage =

						CVMX_USB_STAGE_STATUS;
@@ -2811,8 +2805,7 @@ static int cvmx_usb_poll_channel(struct cvmx_usb_state *usb, int channel) 
					pipe->flags |=

						CVMX_USB_PIPE_FLAGS_NEED_PING;

				if (!buffer_space_left ||

					(bytes_in_last_packet <

					 pipe->max_packet)) {

				    (bytes_in_last_packet < pipe->max_packet)) {

					if (transaction->type ==

					    CVMX_USB_TRANSFER_INTERRUPT)

						pipe->next_tx_frame +=
@@ -2863,8 +2856,7 @@ static int cvmx_usb_poll_channel(struct cvmx_usb_state *usb, int channel) 
						     pipe->max_packet)) {

							pipe->next_tx_frame +=

								pipe->interval;

							cvmx_usb_perform_complete(

								usb,

							cvmx_usb_perform_complete(usb,

										  pipe,

										  transaction,

										  CVMX_USB_COMPLETE_SUCCESS);