aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaro Koskinen <aaro.koskinen@iki.fi>2013-07-30 16:42:55 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-07-31 20:49:05 -0400
commitf1e1c1f69e0d38ddbff9610faa6572f04d3eff20 (patch)
treebe6aa757a6c2a1e9522f9b453c7c8e2d82cdb03e
parent394d4e080f31cd59ccfd1ab8983dcf79c8f7e774 (diff)
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 <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/octeon-usb/cvmx-usb.c4
-rw-r--r--drivers/staging/octeon-usb/cvmx-usb.h16
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 {
153 cvmx_usb_pipe_flags_t flags; /**< State flags for this pipe */ 153 cvmx_usb_pipe_flags_t flags; /**< State flags for this pipe */
154 enum cvmx_usb_speed device_speed; /**< Speed of device connected to this pipe */ 154 enum cvmx_usb_speed device_speed; /**< Speed of device connected to this pipe */
155 enum cvmx_usb_transfer transfer_type; /**< Type of transaction supported by this pipe */ 155 enum cvmx_usb_transfer transfer_type; /**< Type of transaction supported by this pipe */
156 cvmx_usb_direction_t transfer_dir; /**< IN or OUT. Ignored for Control */ 156 enum cvmx_usb_direction transfer_dir; /**< IN or OUT. Ignored for Control */
157 int multi_count; /**< Max packet in a row for the device */ 157 int multi_count; /**< Max packet in a row for the device */
158 uint16_t max_packet; /**< The device's maximum packet size in bytes */ 158 uint16_t max_packet; /**< The device's maximum packet size in bytes */
159 uint8_t device_addr; /**< USB device address at other end of pipe */ 159 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,
1105 int device_addr, int endpoint_num, 1105 int device_addr, int endpoint_num,
1106 enum cvmx_usb_speed device_speed, int max_packet, 1106 enum cvmx_usb_speed device_speed, int max_packet,
1107 enum cvmx_usb_transfer transfer_type, 1107 enum cvmx_usb_transfer transfer_type,
1108 cvmx_usb_direction_t transfer_dir, int interval, 1108 enum cvmx_usb_direction transfer_dir, int interval,
1109 int multi_count, int hub_device_addr, int hub_port) 1109 int multi_count, int hub_device_addr, int hub_port)
1110{ 1110{
1111 cvmx_usb_pipe_t *pipe; 1111 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 {
267}; 267};
268 268
269/** 269/**
270 * Enumeration of the transfer directions 270 * enum cvmx_usb_direction - the transfer directions
271 *
272 * @CVMX_USB_DIRECTION_OUT: Data is transferring from Octeon to the device/host
273 * @CVMX_USB_DIRECTION_IN: Data is transferring from the device/host to Octeon
271 */ 274 */
272typedef enum 275enum cvmx_usb_direction {
273{ 276 CVMX_USB_DIRECTION_OUT,
274 CVMX_USB_DIRECTION_OUT, /**< Data is transferring from Octeon to the device/host */ 277 CVMX_USB_DIRECTION_IN,
275 CVMX_USB_DIRECTION_IN, /**< Data is transferring from the device/host to Octeon */ 278};
276} cvmx_usb_direction_t;
277 279
278/** 280/**
279 * Enumeration of all possible status codes passed to callback 281 * Enumeration of all possible status codes passed to callback
@@ -426,7 +428,7 @@ extern int cvmx_usb_open_pipe(cvmx_usb_state_t *state,
426 int device_addr, int endpoint_num, 428 int device_addr, int endpoint_num,
427 enum cvmx_usb_speed device_speed, int max_packet, 429 enum cvmx_usb_speed device_speed, int max_packet,
428 enum cvmx_usb_transfer transfer_type, 430 enum cvmx_usb_transfer transfer_type,
429 cvmx_usb_direction_t transfer_dir, int interval, 431 enum cvmx_usb_direction transfer_dir, int interval,
430 int multi_count, int hub_device_addr, 432 int multi_count, int hub_device_addr,
431 int hub_port); 433 int hub_port);
432extern int cvmx_usb_submit_bulk(cvmx_usb_state_t *state, int pipe_handle, 434extern int cvmx_usb_submit_bulk(cvmx_usb_state_t *state, int pipe_handle,