From f1e1c1f69e0d38ddbff9610faa6572f04d3eff20 Mon Sep 17 00:00:00 2001 From: Aaro Koskinen Date: Tue, 30 Jul 2013 23:42:55 +0300 Subject: staging: octeon-usb: cvmx_usb_direction_t -> enum cvmx_usb_direction Replace cvmx_usb_direction_t with enum cvmx_usb_direction. Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman --- drivers/staging/octeon-usb/cvmx-usb.c | 4 ++-- drivers/staging/octeon-usb/cvmx-usb.h | 16 +++++++++------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/drivers/staging/octeon-usb/cvmx-usb.c b/drivers/staging/octeon-usb/cvmx-usb.c index ff5d1706c423..533ad5f38826 100644 --- a/drivers/staging/octeon-usb/cvmx-usb.c +++ b/drivers/staging/octeon-usb/cvmx-usb.c @@ -153,7 +153,7 @@ typedef struct cvmx_usb_pipe { cvmx_usb_pipe_flags_t flags; /**< State flags for this pipe */ enum cvmx_usb_speed device_speed; /**< Speed of device connected to 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 */ + enum cvmx_usb_direction 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 */ uint8_t device_addr; /**< USB device address at other end of pipe */ @@ -1105,7 +1105,7 @@ 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, enum cvmx_usb_transfer transfer_type, - cvmx_usb_direction_t transfer_dir, int interval, + enum cvmx_usb_direction transfer_dir, int interval, int multi_count, int hub_device_addr, int hub_port) { cvmx_usb_pipe_t *pipe; diff --git a/drivers/staging/octeon-usb/cvmx-usb.h b/drivers/staging/octeon-usb/cvmx-usb.h index 0cb13ee21950..7c313ff9c3e6 100644 --- a/drivers/staging/octeon-usb/cvmx-usb.h +++ b/drivers/staging/octeon-usb/cvmx-usb.h @@ -267,13 +267,15 @@ enum cvmx_usb_transfer { }; /** - * Enumeration of the transfer directions + * enum cvmx_usb_direction - the transfer directions + * + * @CVMX_USB_DIRECTION_OUT: Data is transferring from Octeon to the device/host + * @CVMX_USB_DIRECTION_IN: Data is transferring from the device/host to Octeon */ -typedef enum -{ - CVMX_USB_DIRECTION_OUT, /**< Data is transferring from Octeon to the device/host */ - CVMX_USB_DIRECTION_IN, /**< Data is transferring from the device/host to Octeon */ -} cvmx_usb_direction_t; +enum cvmx_usb_direction { + CVMX_USB_DIRECTION_OUT, + CVMX_USB_DIRECTION_IN, +}; /** * Enumeration of all possible status codes passed to callback @@ -426,7 +428,7 @@ extern int cvmx_usb_open_pipe(cvmx_usb_state_t *state, int device_addr, int endpoint_num, enum cvmx_usb_speed device_speed, int max_packet, enum cvmx_usb_transfer transfer_type, - cvmx_usb_direction_t transfer_dir, int interval, + enum cvmx_usb_direction transfer_dir, int interval, int multi_count, int hub_device_addr, int hub_port); extern int cvmx_usb_submit_bulk(cvmx_usb_state_t *state, int pipe_handle, -- cgit v1.2.3