From 6e0e1b006993e0a4e2d39421d7adbe1ad92b7cbf Mon Sep 17 00:00:00 2001 From: Aaro Koskinen Date: Tue, 30 Jul 2013 23:43:04 +0300 Subject: [PATCH] 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 Signed-off-by: Greg Kroah-Hartman --- drivers/staging/octeon-usb/cvmx-usb.c | 8 ++++---- drivers/staging/octeon-usb/cvmx-usb.h | 20 ++++++++++++-------- drivers/staging/octeon-usb/octeon-hcd.c | 9 ++++++--- 3 files changed, 22 insertions(+), 15 deletions(-) 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); diff --git a/drivers/staging/octeon-usb/octeon-hcd.c b/drivers/staging/octeon-usb/octeon-hcd.c index 8a41d092b08b..319f2e15662a 100644 --- a/drivers/staging/octeon-usb/octeon-hcd.c +++ b/drivers/staging/octeon-usb/octeon-hcd.c @@ -141,7 +141,8 @@ static void octeon_usb_urb_complete_callback(cvmx_usb_state_t *usb, * The pointer to the private list is stored in the setup_packet * field. */ - cvmx_usb_iso_packet_t *iso_packet = (cvmx_usb_iso_packet_t *) urb->setup_packet; + struct cvmx_usb_iso_packet *iso_packet = + (struct cvmx_usb_iso_packet *) urb->setup_packet; /* Recalculate the transfer size by adding up each packet */ urb->actual_length = 0; for (i = 0; i < urb->number_of_packets; i++) { @@ -208,7 +209,7 @@ static int octeon_usb_urb_enqueue(struct usb_hcd *hcd, int submit_handle = -1; int pipe_handle; unsigned long flags; - cvmx_usb_iso_packet_t *iso_packet; + struct cvmx_usb_iso_packet *iso_packet; struct usb_host_endpoint *ep = urb->ep; urb->status = 0; @@ -305,7 +306,9 @@ static int octeon_usb_urb_enqueue(struct usb_hcd *hcd, * Allocate a structure to use for our private list of * isochronous packets. */ - iso_packet = kmalloc(urb->number_of_packets * sizeof(cvmx_usb_iso_packet_t), GFP_ATOMIC); + iso_packet = kmalloc(urb->number_of_packets * + sizeof(struct cvmx_usb_iso_packet), + GFP_ATOMIC); if (iso_packet) { int i; /* Fill the list with the data from the URB */ -- 2.20.1