staging: octeon-usb: delete cvmx_usb_isochronous_flags (5dc0316c) · Commits · 戴 / test

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

+2 −7

Original line number	Diff line number	Diff line
		@@ -2349,9 +2349,6 @@ int cvmx_usb_submit_control(struct cvmx_usb_state *state, int pipe_handle,
		* @start_frame:
		* Number of frames into the future to schedule
		* this transaction.
		* @flags: Flags to control the transfer. See
		* enum cvmx_usb_isochronous_flags for the flag
		* definitions.
		* @number_packets:
		* Number of sequential packets to transfer.
		* "packets" is a pointer to an array of this
		@@ -2384,7 +2381,7 @@ int cvmx_usb_submit_control(struct cvmx_usb_state *state, int pipe_handle,
		* failure. Negative values are error codes.
		*/
		int cvmx_usb_submit_isochronous(struct cvmx_usb_state *state, int pipe_handle,
		int start_frame, int flags,
		int start_frame,
		int number_packets,
		struct cvmx_usb_iso_packet packets[],
		uint64_t buffer, int buffer_length,
		@@ -2397,8 +2394,6 @@ int cvmx_usb_submit_isochronous(struct cvmx_usb_state *state, int pipe_handle,
		/* Pipe handle checking is done later in a common place */
		if (unlikely(start_frame < 0))
		return -EINVAL;
		if (unlikely(flags & ~(CVMX_USB_ISOCHRONOUS_FLAGS_ALLOW_SHORT \| CVMX_USB_ISOCHRONOUS_FLAGS_ASAP)))
		return -EINVAL;
		if (unlikely(number_packets < 1))
		return -EINVAL;
		if (unlikely(!packets))
		@@ -2410,7 +2405,7 @@ int cvmx_usb_submit_isochronous(struct cvmx_usb_state *state, int pipe_handle,

		submit_handle = __cvmx_usb_submit_transaction(usb, pipe_handle,
		CVMX_USB_TRANSFER_ISOCHRONOUS,
		flags,
		0,
		buffer,
		buffer_length,
		0, /* control_header */

+1 −16

Original line number	Diff line number	Diff line
		@@ -502,23 +502,8 @@ extern int cvmx_usb_submit_control(struct cvmx_usb_state *state, int pipe_handle
		cvmx_usb_callback_func_t callback,
		void *user_data);

		/**
		* enum cvmx_usb_isochronous_flags - flags to pass the
		* cvmx_usb_submit_isochronous() function.
		*
		* @CVMX_USB_ISOCHRONOUS_FLAGS_ALLOW_SHORT: Do not return an error if a transfer
		* is less than the maximum packet size
		* of the device.
		* @CVMX_USB_ISOCHRONOUS_FLAGS_ASAP: Schedule the transaction as soon as
		* possible.
		*/
		enum cvmx_usb_isochronous_flags {
		CVMX_USB_ISOCHRONOUS_FLAGS_ALLOW_SHORT = 1 << 0,
		CVMX_USB_ISOCHRONOUS_FLAGS_ASAP = 1 << 1,
		};

		extern int cvmx_usb_submit_isochronous(struct cvmx_usb_state *state, int pipe_handle,
		int start_frame, int flags,
		int start_frame,
		int number_packets,
		struct cvmx_usb_iso_packet packets[],
		uint64_t buffer, int buffer_length,

+0 −1

Original line number	Diff line number	Diff line
		@@ -325,7 +325,6 @@ static int octeon_usb_urb_enqueue(struct usb_hcd *hcd,
		urb->setup_packet = (char *)iso_packet;
		submit_handle = cvmx_usb_submit_isochronous(&priv->usb, pipe_handle,
		urb->start_frame,
		0 /* flags */ ,
		urb->number_of_packets,
		iso_packet,
		urb->transfer_dma,