staging: octeon-usb: cvmx_usb_transfer_t -> enum cvmx_usb_transfer

Replace cvmx_usb_transfer_t with enum cvmx_usb_transfer.

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

3 files changed, 23 insertions, 15 deletions

diff --git a/drivers/staging/octeon-usb/cvmx-usb.c b/drivers/staging/octeon-usb/cvmx-usb.c
index 44f4db0cfd9a..ff5d1706c423 100644
--- a/drivers/staging/octeon-usb/cvmx-usb.c
+++ b/drivers/staging/octeon-usb/cvmx-usb.c
@@ -122,7 +122,7 @@ typedef enum {
 typedef struct cvmx_usb_transaction {
 	struct cvmx_usb_transaction *prev;	/**< Transaction before this one in the pipe */
 	struct cvmx_usb_transaction *next;	/**< Transaction after this one in the pipe */
-	cvmx_usb_transfer_t type;		/**< Type of transaction, duplicated of the pipe */
+	enum cvmx_usb_transfer type;		/**< Type of transaction, duplicated of the pipe */
 	cvmx_usb_transaction_flags_t flags;	/**< State flags for this transaction */
 	uint64_t buffer;			/**< User's physical buffer address to read/write */
 	int buffer_length;			/**< Size of the user's buffer in bytes */
@@ -152,7 +152,7 @@ typedef struct cvmx_usb_pipe {
 	uint64_t next_tx_frame;			/**< The next frame this pipe is allowed to transmit on */
 	cvmx_usb_pipe_flags_t flags;		/**< State flags for this pipe */
 	enum cvmx_usb_speed device_speed;	/**< Speed of device connected to this pipe */
-	cvmx_usb_transfer_t transfer_type;	/**< Type of transaction supported by this pipe */
+	enum cvmx_usb_transfer transfer_type;	/**< Type of transaction supported by this pipe */
 	cvmx_usb_direction_t transfer_dir;	/**< IN or OUT. Ignored for Control */
 	int multi_count;			/**< Max packet in a row for the device */
 	uint16_t max_packet;			/**< The device's maximum packet size in bytes */
@@ -1104,7 +1104,7 @@ static inline int __cvmx_usb_get_pipe_handle(cvmx_usb_internal_state_t *usb,
 int cvmx_usb_open_pipe(cvmx_usb_state_t *state, cvmx_usb_pipe_flags_t flags,
 		       int device_addr, int endpoint_num,
 		       enum cvmx_usb_speed device_speed, int max_packet,
-		       cvmx_usb_transfer_t transfer_type,
+		       enum cvmx_usb_transfer transfer_type,
 		       cvmx_usb_direction_t transfer_dir, int interval,
 		       int multi_count, int hub_device_addr, int hub_port)
 {
@@ -1825,7 +1825,7 @@ static void __cvmx_usb_schedule(cvmx_usb_internal_state_t *usb, int is_sof)
 	int channel;
 	cvmx_usb_pipe_t *pipe;
 	int need_sof;
-	cvmx_usb_transfer_t ttype;
+	enum cvmx_usb_transfer ttype;
 
 	if (usb->init_flags & CVMX_USB_INITIALIZE_FLAGS_NO_DMA) {
 		/* Without DMA we need to be careful to not schedule something at the end of a frame and cause an overrun */
@@ -2025,7 +2025,7 @@ done:
  */
 static int __cvmx_usb_submit_transaction(cvmx_usb_internal_state_t *usb,
 					 int pipe_handle,
-					 cvmx_usb_transfer_t type,
+					 enum cvmx_usb_transfer type,
 					 int flags,
 					 uint64_t buffer,
 					 int buffer_length,
diff --git a/drivers/staging/octeon-usb/cvmx-usb.h b/drivers/staging/octeon-usb/cvmx-usb.h
index c5ccda34b530..0cb13ee21950 100644
--- a/drivers/staging/octeon-usb/cvmx-usb.h
+++ b/drivers/staging/octeon-usb/cvmx-usb.h
@@ -248,15 +248,23 @@ enum cvmx_usb_speed {
 };
 
 /**
- * Enumeration representing the possible USB transfer types.
+ * enum cvmx_usb_transfer - the possible USB transfer types
+ *
+ * @CVMX_USB_TRANSFER_CONTROL:	   USB transfer type control for hub and status
+ *				   transfers
+ * @CVMX_USB_TRANSFER_ISOCHRONOUS: USB transfer type isochronous for low
+ *				   priority periodic transfers
+ * @CVMX_USB_TRANSFER_BULK:	   USB transfer type bulk for large low priority
+ *				   transfers
+ * @CVMX_USB_TRANSFER_INTERRUPT:   USB transfer type interrupt for high priority
+ *				   periodic transfers
  */
-typedef enum
-{
-    CVMX_USB_TRANSFER_CONTROL = 0,      /**< USB transfer type control for hub and status transfers */
-    CVMX_USB_TRANSFER_ISOCHRONOUS = 1,  /**< USB transfer type isochronous for low priority periodic transfers */
-    CVMX_USB_TRANSFER_BULK = 2,         /**< USB transfer type bulk for large low priority transfers */
-    CVMX_USB_TRANSFER_INTERRUPT = 3,    /**< USB transfer type interrupt for high priority periodic transfers */
-} cvmx_usb_transfer_t;
+enum cvmx_usb_transfer {
+	CVMX_USB_TRANSFER_CONTROL = 0,
+	CVMX_USB_TRANSFER_ISOCHRONOUS = 1,
+	CVMX_USB_TRANSFER_BULK = 2,
+	CVMX_USB_TRANSFER_INTERRUPT = 3,
+};
 
 /**
  * Enumeration of the transfer directions
@@ -417,7 +425,7 @@ extern int cvmx_usb_open_pipe(cvmx_usb_state_t *state,
                               cvmx_usb_pipe_flags_t flags,
                               int device_addr, int endpoint_num,
                               enum cvmx_usb_speed device_speed, int max_packet,
-                              cvmx_usb_transfer_t transfer_type,
+                              enum cvmx_usb_transfer transfer_type,
                               cvmx_usb_direction_t transfer_dir, int interval,
                               int multi_count, int hub_device_addr,
                               int hub_port);
diff --git a/drivers/staging/octeon-usb/octeon-hcd.c b/drivers/staging/octeon-usb/octeon-hcd.c
index f32d8fc60200..6ab78ed57e80 100644
--- a/drivers/staging/octeon-usb/octeon-hcd.c
+++ b/drivers/staging/octeon-usb/octeon-hcd.c
@@ -216,7 +216,7 @@ static int octeon_usb_urb_enqueue(struct usb_hcd *hcd,
 	spin_lock_irqsave(&priv->lock, flags);
 
 	if (!ep->hcpriv) {
-		cvmx_usb_transfer_t transfer_type;
+		enum cvmx_usb_transfer transfer_type;
 		enum cvmx_usb_speed speed;
 		int split_device = 0;
 		int split_port = 0;