[PATCH 02/12] staging: octeon-usb: delete cvmx_usb_isochronous_flags

Aaro Koskinen aaro.koskinen at iki.fi
Tue Oct 1 20:43:10 UTC 2013


Delete unused flags.

Signed-off-by: Aaro Koskinen <aaro.koskinen at iki.fi>
---
 drivers/staging/octeon-usb/cvmx-usb.c   |  9 ++-------
 drivers/staging/octeon-usb/cvmx-usb.h   | 17 +----------------
 drivers/staging/octeon-usb/octeon-hcd.c |  1 -
 3 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/drivers/staging/octeon-usb/cvmx-usb.c b/drivers/staging/octeon-usb/cvmx-usb.c
index 22efd59..f9a6801 100644
--- a/drivers/staging/octeon-usb/cvmx-usb.c
+++ b/drivers/staging/octeon-usb/cvmx-usb.c
@@ -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 */
diff --git a/drivers/staging/octeon-usb/cvmx-usb.h b/drivers/staging/octeon-usb/cvmx-usb.h
index 74edb0a..6fc5491 100644
--- a/drivers/staging/octeon-usb/cvmx-usb.h
+++ b/drivers/staging/octeon-usb/cvmx-usb.h
@@ -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,
diff --git a/drivers/staging/octeon-usb/octeon-hcd.c b/drivers/staging/octeon-usb/octeon-hcd.c
index 9b9cc1f..f238d1b 100644
--- a/drivers/staging/octeon-usb/octeon-hcd.c
+++ b/drivers/staging/octeon-usb/octeon-hcd.c
@@ -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,
-- 
1.8.4.rc3



More information about the devel mailing list