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

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

staging: octeon-usb: rename cvmx_usb_perform_complete to cvmx_usb_complete 



Rename cvmx_usb_perform_complete to cvmx_usb_complete.

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

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

+42 −47
Original line number Diff line number Diff line
@@ -2054,7 +2054,7 @@ static void octeon_usb_urb_complete_callback(struct cvmx_usb_state *usb, 
 * @complete_code:

 *		 Completion code

 */

static void cvmx_usb_perform_complete(struct cvmx_usb_state *usb,

static void cvmx_usb_complete(struct cvmx_usb_state *usb,

			      struct cvmx_usb_pipe *pipe,

			      struct cvmx_usb_transaction *transaction,

			      enum cvmx_usb_status complete_code)
@@ -2325,8 +2325,7 @@ static int cvmx_usb_cancel(struct cvmx_usb_state *usb, 
					     usbc_hcchar.u32);

		}

	}

	cvmx_usb_perform_complete(usb, pipe, transaction,

				  CVMX_USB_STATUS_CANCEL);

	cvmx_usb_complete(usb, pipe, transaction, CVMX_USB_STATUS_CANCEL);

	return 0;

}
@@ -2587,7 +2586,7 @@ static int cvmx_usb_poll_channel(struct cvmx_usb_state *usb, int channel) 
		 * keeps substracting same byte count over and over again. In

		 * such case we just need to fail every transaction.

		 */

		cvmx_usb_perform_complete(usb, pipe, transaction,

		cvmx_usb_complete(usb, pipe, transaction,

				  CVMX_USB_STATUS_ERROR);

		return 0;

	}
@@ -2600,7 +2599,7 @@ static int cvmx_usb_poll_channel(struct cvmx_usb_state *usb, int channel) 
		 * the actual bytes transferred

		 */

		pipe->pid_toggle = 0;

		cvmx_usb_perform_complete(usb, pipe, transaction,

		cvmx_usb_complete(usb, pipe, transaction,

				  CVMX_USB_STATUS_STALL);

	} else if (usbc_hcint.s.xacterr) {

		/*
@@ -2608,15 +2607,15 @@ static int cvmx_usb_poll_channel(struct cvmx_usb_state *usb, int channel) 
		 * something wrong with the transfer. For example, PID

		 * toggle errors cause these.

		 */

		cvmx_usb_perform_complete(usb, pipe, transaction,

		cvmx_usb_complete(usb, pipe, transaction,

				  CVMX_USB_STATUS_XACTERR);

	} else if (usbc_hcint.s.bblerr) {

		/* Babble Error (BblErr) */

		cvmx_usb_perform_complete(usb, pipe, transaction,

		cvmx_usb_complete(usb, pipe, transaction,

				  CVMX_USB_STATUS_BABBLEERR);

	} else if (usbc_hcint.s.datatglerr) {

		/* Data toggle error */

		cvmx_usb_perform_complete(usb, pipe, transaction,

		cvmx_usb_complete(usb, pipe, transaction,

				  CVMX_USB_STATUS_DATATGLERR);

	} else if (usbc_hcint.s.nyet) {

		/*
@@ -2633,7 +2632,7 @@ static int cvmx_usb_poll_channel(struct cvmx_usb_state *usb, int channel) 
			 */

			if ((buffer_space_left == 0) ||

			    (bytes_in_last_packet < pipe->max_packet))

				cvmx_usb_perform_complete(usb, pipe,

				cvmx_usb_complete(usb, pipe,

						  transaction,

						  CVMX_USB_STATUS_SUCCESS);

		} else {
@@ -2673,8 +2672,7 @@ static int cvmx_usb_poll_channel(struct cvmx_usb_state *usb, int channel) 
			case CVMX_USB_STAGE_NON_CONTROL:

			case CVMX_USB_STAGE_NON_CONTROL_SPLIT_COMPLETE:

				/* This should be impossible */

				cvmx_usb_perform_complete(usb, pipe,

							  transaction,

				cvmx_usb_complete(usb, pipe, transaction,

						  CVMX_USB_STATUS_ERROR);

				break;

			case CVMX_USB_STAGE_SETUP:
@@ -2747,13 +2745,12 @@ static int cvmx_usb_poll_channel(struct cvmx_usb_state *usb, int channel) 
					transaction->stage =

						CVMX_USB_STAGE_STATUS_SPLIT_COMPLETE;

				else

					cvmx_usb_perform_complete(usb, pipe,

					cvmx_usb_complete(usb, pipe,

							  transaction,

							  CVMX_USB_STATUS_SUCCESS);

				break;

			case CVMX_USB_STAGE_STATUS_SPLIT_COMPLETE:

				cvmx_usb_perform_complete(usb, pipe,

							  transaction,

				cvmx_usb_complete(usb, pipe, transaction,

						  CVMX_USB_STATUS_SUCCESS);

				break;

			}
@@ -2781,8 +2778,7 @@ static int cvmx_usb_poll_channel(struct cvmx_usb_state *usb, int channel) 
					    CVMX_USB_TRANSFER_INTERRUPT)

						pipe->next_tx_frame +=

							pipe->interval;

					cvmx_usb_perform_complete(usb,

								  pipe,

					cvmx_usb_complete(usb, pipe,

							  transaction,

							  CVMX_USB_STATUS_SUCCESS);

				}
@@ -2802,7 +2798,7 @@ static int cvmx_usb_poll_channel(struct cvmx_usb_state *usb, int channel) 
					    CVMX_USB_TRANSFER_INTERRUPT)

						pipe->next_tx_frame +=

							pipe->interval;

					cvmx_usb_perform_complete(usb, pipe,

					cvmx_usb_complete(usb, pipe,

							  transaction,

							  CVMX_USB_STATUS_SUCCESS);

				}
@@ -2830,8 +2826,8 @@ static int cvmx_usb_poll_channel(struct cvmx_usb_state *usb, int channel) 
					    (bytes_this_transfer < 188)) {

						pipe->next_tx_frame +=

							pipe->interval;

						cvmx_usb_perform_complete(usb,

									  pipe, transaction,

						cvmx_usb_complete(usb, pipe,

								  transaction,

								  CVMX_USB_STATUS_SUCCESS);

					}

				} else {
@@ -2848,7 +2844,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_complete(usb,

									  pipe,

									  transaction,

									  CVMX_USB_STATUS_SUCCESS);
@@ -2859,8 +2855,7 @@ static int cvmx_usb_poll_channel(struct cvmx_usb_state *usb, int channel) 
				}

			} else {

				pipe->next_tx_frame += pipe->interval;

				cvmx_usb_perform_complete(usb, pipe,

							  transaction,

				cvmx_usb_complete(usb, pipe, transaction,

						  CVMX_USB_STATUS_SUCCESS);

			}

			break;
@@ -2897,7 +2892,7 @@ static int cvmx_usb_poll_channel(struct cvmx_usb_state *usb, int channel) 
			 * We get channel halted interrupts with no result bits

			 * sets when the cable is unplugged

			 */

			cvmx_usb_perform_complete(usb, pipe, transaction,

			cvmx_usb_complete(usb, pipe, transaction,

					  CVMX_USB_STATUS_ERROR);

		}

	}