Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c1bdf27 authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Greg Kroah-Hartman
Browse files

staging: octeon-usb: cvmx_usb_complete_t -> enum cvmx_usb_complete 



Replace cvmx_usb_complete_t with enum cvmx_usb_complete.

Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f1e1c1f6

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -1902,7 +1902,7 @@ static void __cvmx_usb_perform_callback(cvmx_usb_internal_state_t *usb, 
					cvmx_usb_pipe_t *pipe,

					cvmx_usb_pipe_t *pipe,

					cvmx_usb_transaction_t *transaction,

					cvmx_usb_transaction_t *transaction,

					cvmx_usb_callback_t reason,

					cvmx_usb_callback_t reason,

					cvmx_usb_complete_t complete_code)

					enum cvmx_usb_complete complete_code)

{

{

	cvmx_usb_callback_func_t callback = usb->callback[reason];

	cvmx_usb_callback_func_t callback = usb->callback[reason];

	void *user_data = usb->callback_data[reason];

	void *user_data = usb->callback_data[reason];
@@ -1946,7 +1946,7 @@ static void __cvmx_usb_perform_callback(cvmx_usb_internal_state_t *usb, 
static void __cvmx_usb_perform_complete(cvmx_usb_internal_state_t *usb,

static void __cvmx_usb_perform_complete(cvmx_usb_internal_state_t *usb,

					cvmx_usb_pipe_t *pipe,

					cvmx_usb_pipe_t *pipe,

					cvmx_usb_transaction_t *transaction,

					cvmx_usb_transaction_t *transaction,

					cvmx_usb_complete_t complete_code)

					enum cvmx_usb_complete complete_code)

{

{

	/* If this was a split then clear our split in progress marker */

	/* If this was a split then clear our split in progress marker */

	if (usb->active_split == transaction)

	if (usb->active_split == transaction)

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

+35 −20
Original line number Original line Diff line number Diff line
@@ -116,7 +116,7 @@ 
 *

 *

 * void port_callback(cvmx_usb_state_t *usb,

 * void port_callback(cvmx_usb_state_t *usb,

 *                    cvmx_usb_callback_t reason,

 *                    cvmx_usb_callback_t reason,

 *                    cvmx_usb_complete_t status,

 *                    enum cvmx_usb_complete status,

 *                    int pipe_handle,

 *                    int pipe_handle,

 *                    int submit_handle,

 *                    int submit_handle,

 *                    int bytes_transferred,

 *                    int bytes_transferred,
@@ -148,14 +148,14 @@ 
 *

 *

 * void complete_callback(cvmx_usb_state_t *usb,

 * void complete_callback(cvmx_usb_state_t *usb,

 *                        cvmx_usb_callback_t reason,

 *                        cvmx_usb_callback_t reason,

 *                        cvmx_usb_complete_t status,

 *                        enum cvmx_usb_complete status,

 *                        int pipe_handle,

 *                        int pipe_handle,

 *                        int submit_handle,

 *                        int submit_handle,

 *                        int bytes_transferred,

 *                        int bytes_transferred,

 *                        void *user_data);

 *                        void *user_data);

 * - "usb" is the cvmx_usb_state_t for the port.

 * - "usb" is the cvmx_usb_state_t for the port.

 * - "reason" will always be CVMX_USB_CALLBACK_TRANSFER_COMPLETE.

 * - "reason" will always be CVMX_USB_CALLBACK_TRANSFER_COMPLETE.

 * - "status" will be one of the cvmx_usb_complete_t enumerations.

 * - "status" will be one of the cvmx_usb_complete enumerations.

 * - "pipe_handle" is the handle to the pipe the transaction

 * - "pipe_handle" is the handle to the pipe the transaction

 *   was originally submitted on.

 *   was originally submitted on.

 * - "submit_handle" is the handle returned by the original

 * - "submit_handle" is the handle returned by the original
@@ -278,21 +278,36 @@ enum cvmx_usb_direction { 
};

};





/**

/**

 * Enumeration of all possible status codes passed to callback

 * enum cvmx_usb_complete - possible callback function status codes

 * functions.

 *

 * @CVMX_USB_COMPLETE_SUCCESS:	  The transaction / operation finished without

 *				  any errors

 * @CVMX_USB_COMPLETE_SHORT:	  FIXME: This is currently not implemented

 * @CVMX_USB_COMPLETE_CANCEL:	  The transaction was canceled while in flight by

 *				  a user call to cvmx_usb_cancel

 * @CVMX_USB_COMPLETE_ERROR:	  The transaction aborted with an unexpected

 *				  error status

 * @CVMX_USB_COMPLETE_STALL:	  The transaction received a USB STALL response

 *				  from the device

 * @CVMX_USB_COMPLETE_XACTERR:	  The transaction failed with an error from the

 *				  device even after a number of retries

 * @CVMX_USB_COMPLETE_DATATGLERR: The transaction failed with a data toggle

 *				  error even after a number of retries

 * @CVMX_USB_COMPLETE_BABBLEERR:  The transaction failed with a babble error

 * @CVMX_USB_COMPLETE_FRAMEERR:	  The transaction failed with a frame error

 *				  even after a number of retries

 */

 */

typedef enum

enum cvmx_usb_complete {

{

	CVMX_USB_COMPLETE_SUCCESS,

    CVMX_USB_COMPLETE_SUCCESS,      /**< The transaction / operation finished without any errors */

	CVMX_USB_COMPLETE_SHORT,

    CVMX_USB_COMPLETE_SHORT,        /**< FIXME: This is currently not implemented */

	CVMX_USB_COMPLETE_CANCEL,

    CVMX_USB_COMPLETE_CANCEL,       /**< The transaction was canceled while in flight by a user call to cvmx_usb_cancel* */

	CVMX_USB_COMPLETE_ERROR,

    CVMX_USB_COMPLETE_ERROR,        /**< The transaction aborted with an unexpected error status */

	CVMX_USB_COMPLETE_STALL,

    CVMX_USB_COMPLETE_STALL,        /**< The transaction received a USB STALL response from the device */

	CVMX_USB_COMPLETE_XACTERR,

    CVMX_USB_COMPLETE_XACTERR,      /**< The transaction failed with an error from the device even after a number of retries */

	CVMX_USB_COMPLETE_DATATGLERR,

    CVMX_USB_COMPLETE_DATATGLERR,   /**< The transaction failed with a data toggle error even after a number of retries */

	CVMX_USB_COMPLETE_BABBLEERR,

    CVMX_USB_COMPLETE_BABBLEERR,    /**< The transaction failed with a babble error */

	CVMX_USB_COMPLETE_FRAMEERR,

    CVMX_USB_COMPLETE_FRAMEERR,     /**< The transaction failed with a frame error even after a number of retries */

};

} cvmx_usb_complete_t;





/**

/**

 * Structure returned containing the USB port status information.

 * Structure returned containing the USB port status information.
@@ -331,7 +346,7 @@ typedef struct 
{

{

    int offset;                     /**< This is the offset in bytes into the main buffer where this data is stored */

    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 */

    int length;                     /**< This is the length in bytes of the data */

    cvmx_usb_complete_t status;     /**< This is the status of this individual packet transfer */

    enum cvmx_usb_complete status;  /**< This is the status of this individual packet transfer */

} cvmx_usb_iso_packet_t;

} cvmx_usb_iso_packet_t;





/**

/**
@@ -368,7 +383,7 @@ typedef struct 
 *        cvmx_usb_initialize().

 *        cvmx_usb_initialize().

 *      - reason = The cvmx_usb_callback_t used to register

 *      - reason = The cvmx_usb_callback_t used to register

 *        the callback.

 *        the callback.

 *      - status = The cvmx_usb_complete_t representing the

 *      - status = The enum cvmx_usb_complete representing the

 *        status code of a transaction.

 *        status code of a transaction.

 *      - pipe_handle = The Pipe that caused this callback, or

 *      - pipe_handle = The Pipe that caused this callback, or

 *        -1 if this callback wasn't associated with a pipe.

 *        -1 if this callback wasn't associated with a pipe.
@@ -381,7 +396,7 @@ typedef struct 
 *        cvmx_usb_register_callback() */

 *        cvmx_usb_register_callback() */

typedef void (*cvmx_usb_callback_func_t)(cvmx_usb_state_t *state,

typedef void (*cvmx_usb_callback_func_t)(cvmx_usb_state_t *state,

                                         cvmx_usb_callback_t reason,

                                         cvmx_usb_callback_t reason,

                                         cvmx_usb_complete_t status,

                                         enum cvmx_usb_complete status,

                                         int pipe_handle, int submit_handle,

                                         int pipe_handle, int submit_handle,

                                         int bytes_transferred, void *user_data);

                                         int bytes_transferred, void *user_data);

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -60,7 +60,7 @@ static irqreturn_t octeon_usb_irq(struct usb_hcd *hcd) 




static void octeon_usb_port_callback(cvmx_usb_state_t *usb,

static void octeon_usb_port_callback(cvmx_usb_state_t *usb,

				     cvmx_usb_callback_t reason,

				     cvmx_usb_callback_t reason,

				     cvmx_usb_complete_t status,

				     enum cvmx_usb_complete status,

				     int pipe_handle,

				     int pipe_handle,

				     int submit_handle,

				     int submit_handle,

				     int bytes_transferred,

				     int bytes_transferred,
@@ -107,7 +107,7 @@ static int octeon_usb_get_frame_number(struct usb_hcd *hcd) 




static void octeon_usb_urb_complete_callback(cvmx_usb_state_t *usb,

static void octeon_usb_urb_complete_callback(cvmx_usb_state_t *usb,

					     cvmx_usb_callback_t reason,

					     cvmx_usb_callback_t reason,

					     cvmx_usb_complete_t status,

					     enum cvmx_usb_complete status,

					     int pipe_handle,

					     int pipe_handle,

					     int submit_handle,

					     int submit_handle,

					     int bytes_transferred,

					     int bytes_transferred,