From: Aaro Koskinen <aaro.koskinen@iki.fi>
Date: Tue, 30 Jul 2013 20:43:04 +0000 (+0300)
Subject: staging: octeon-usb: cvmx_usb_iso_packet_t -> struct cvmx_usb_iso_packet
X-Git-Tag: v3.12-rc1~183^2~377
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e0e1b006993e0a4e2d39421d7adbe1ad92b7cbf;p=pandora-kernel.git

staging: octeon-usb: cvmx_usb_iso_packet_t -> struct cvmx_usb_iso_packet

Replace cvmx_usb_iso_packet_t with struct cvmx_usb_iso_packet.

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

diff --git a/drivers/staging/octeon-usb/cvmx-usb.c b/drivers/staging/octeon-usb/cvmx-usb.c
index c92b15f30fea..6c79cc15b516 100644
--- a/drivers/staging/octeon-usb/cvmx-usb.c
+++ b/drivers/staging/octeon-usb/cvmx-usb.c
@@ -129,7 +129,7 @@ typedef struct cvmx_usb_transaction {
 	uint64_t control_header;		/**< For control transactions, physical address of the 8 byte standard header */
 	int iso_start_frame;			/**< For ISO transactions, the starting frame number */
 	int iso_number_packets;			/**< For ISO transactions, the number of packets in the request */
-	cvmx_usb_iso_packet_t *iso_packets;	/**< For ISO transactions, the sub packets in the request */
+	struct cvmx_usb_iso_packet *iso_packets;/**< For ISO transactions, the sub packets in the request */
 	int xfersize;
 	int pktcnt;
 	int retries;
@@ -2032,7 +2032,7 @@ static int __cvmx_usb_submit_transaction(cvmx_usb_internal_state_t *usb,
 					 uint64_t control_header,
 					 int iso_start_frame,
 					 int iso_number_packets,
-					 cvmx_usb_iso_packet_t *iso_packets,
+					 struct cvmx_usb_iso_packet *iso_packets,
 					 cvmx_usb_callback_func_t callback,
 					 void *user_data)
 {
@@ -2298,7 +2298,7 @@ int cvmx_usb_submit_control(cvmx_usb_state_t *state, int pipe_handle,
  *		    "packets" is a pointer to an array of this
  *		    many packet structures.
  * @packets:	    Description of each transfer packet as
- *		    defined by cvmx_usb_iso_packet_t. The array
+ *		    defined by struct cvmx_usb_iso_packet. The array
  *		    pointed to here must stay valid until the
  *		    complete callback is called.
  * @buffer:	    Physical address of the data buffer in
@@ -2327,7 +2327,7 @@ int cvmx_usb_submit_control(cvmx_usb_state_t *state, int pipe_handle,
 int cvmx_usb_submit_isochronous(cvmx_usb_state_t *state, int pipe_handle,
 				int start_frame, int flags,
 				int number_packets,
-				cvmx_usb_iso_packet_t packets[],
+				struct cvmx_usb_iso_packet packets[],
 				uint64_t buffer, int buffer_length,
 				cvmx_usb_callback_func_t callback,
 				void *user_data)
diff --git a/drivers/staging/octeon-usb/cvmx-usb.h b/drivers/staging/octeon-usb/cvmx-usb.h
index 9c7ff4a6c52e..b0d0f6aab5d1 100644
--- a/drivers/staging/octeon-usb/cvmx-usb.h
+++ b/drivers/staging/octeon-usb/cvmx-usb.h
@@ -351,14 +351,18 @@ typedef union
 } cvmx_usb_control_header_t;
 
 /**
- * Descriptor for Isochronous packets
+ * struct cvmx_usb_iso_packet - descriptor for Isochronous packets
+ *
+ * @offset:	This is the offset in bytes into the main buffer where this data
+ *		is stored.
+ * @length:	This is the length in bytes of the data.
+ * @status:	This is the status of this individual packet transfer.
  */
-typedef struct
-{
-    int offset;                     /**< This is the offset in bytes into the main buffer where this data is stored */
-    int length;                     /**< This is the length in bytes of the data */
-    enum cvmx_usb_complete status;  /**< This is the status of this individual packet transfer */
-} cvmx_usb_iso_packet_t;
+struct cvmx_usb_iso_packet {
+	int offset;
+	int length;
+	enum cvmx_usb_complete status;
+};
 
 /**
  * enum cvmx_usb_callback - possible callback reasons for the USB API
@@ -516,7 +520,7 @@ enum cvmx_usb_isochronous_flags {
 extern int cvmx_usb_submit_isochronous(cvmx_usb_state_t *state, int pipe_handle,
                                        int start_frame, int flags,
                                        int number_packets,
-                                       cvmx_usb_iso_packet_t packets[],
+                                       struct cvmx_usb_iso_packet packets[],
                                        uint64_t buffer, int buffer_length,
                                        cvmx_usb_callback_func_t callback,
                                        void *user_data);
Reading git-diff-tree failed