Delete redudant flags parameter.
Signed-off-by: Aaro Koskinen <aaro.koski...@iki.fi>
---
drivers/staging/octeon-usb/cvmx-usb.c | 6 ++----
drivers/staging/octeon-usb/cvmx-usb.h | 4 +---
drivers/staging/octeon-usb/octeon-hcd.c | 1 -
3 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/octeon-usb/cvmx-usb.c
b/drivers/staging/octeon-usb/cvmx-usb.c
index 54b5c5c..3dd732e 100644
--- a/drivers/staging/octeon-usb/cvmx-usb.c
+++ b/drivers/staging/octeon-usb/cvmx-usb.c
@@ -1109,8 +1109,6 @@ static inline int __cvmx_usb_get_pipe_handle(struct
cvmx_usb_internal_state *usb
*
* @state: USB device state populated by
* cvmx_usb_initialize().
- * @flags: Optional pipe flags defined in
- * enum cvmx_usb_pipe_flags.
* @device_addr:
* USB device address to open the pipe to
* (0-127).
@@ -1158,7 +1156,7 @@ static inline int __cvmx_usb_get_pipe_handle(struct
cvmx_usb_internal_state *usb
* Returns: A non negative value is a pipe handle. Negative
* values are error codes.
*/
-int cvmx_usb_open_pipe(struct cvmx_usb_state *state, enum cvmx_usb_pipe_flags
flags,
+int cvmx_usb_open_pipe(struct cvmx_usb_state *state,
int device_addr, int endpoint_num,
enum cvmx_usb_speed device_speed, int max_packet,
enum cvmx_usb_transfer transfer_type,
@@ -1200,7 +1198,7 @@ int cvmx_usb_open_pipe(struct cvmx_usb_state *state, enum
cvmx_usb_pipe_flags fl
if (!pipe)
return -ENOMEM;
__cvmx_usb_remove_pipe(&usb->free_pipes, pipe);
- pipe->flags = flags | __CVMX_USB_PIPE_FLAGS_OPEN;
+ pipe->flags = __CVMX_USB_PIPE_FLAGS_OPEN;
if ((device_speed == CVMX_USB_SPEED_HIGH) &&
(transfer_dir == CVMX_USB_DIRECTION_OUT) &&
(transfer_type == CVMX_USB_TRANSFER_BULK))
diff --git a/drivers/staging/octeon-usb/cvmx-usb.h
b/drivers/staging/octeon-usb/cvmx-usb.h
index 6fc5491..a8ae8ca 100644
--- a/drivers/staging/octeon-usb/cvmx-usb.h
+++ b/drivers/staging/octeon-usb/cvmx-usb.h
@@ -455,8 +455,7 @@ enum cvmx_usb_initialize_flags {
};
/**
- * enum cvmx_usb_pipe_flags - flags for passing when a pipe is created.
- * Currently no flags need to be passed.
+ * enum cvmx_usb_pipe_flags - internal flags for a pipe.
*
* @__CVMX_USB_PIPE_FLAGS_OPEN: Used internally to determine if a
pipe is
* open. Do not use.
@@ -481,7 +480,6 @@ extern int cvmx_usb_disable(struct cvmx_usb_state *state);
extern struct cvmx_usb_port_status cvmx_usb_get_status(struct cvmx_usb_state
*state);
extern void cvmx_usb_set_status(struct cvmx_usb_state *state, struct
cvmx_usb_port_status port_status);
extern int cvmx_usb_open_pipe(struct cvmx_usb_state *state,
- enum cvmx_usb_pipe_flags flags,
int device_addr, int endpoint_num,
enum cvmx_usb_speed device_speed, int max_packet,
enum cvmx_usb_transfer transfer_type,
diff --git a/drivers/staging/octeon-usb/octeon-hcd.c
b/drivers/staging/octeon-usb/octeon-hcd.c
index f238d1b..764a8df 100644
--- a/drivers/staging/octeon-usb/octeon-hcd.c
+++ b/drivers/staging/octeon-usb/octeon-hcd.c
@@ -277,7 +277,6 @@ static int octeon_usb_urb_enqueue(struct usb_hcd *hcd,
}
}
pipe_handle = cvmx_usb_open_pipe(&priv->usb,
- 0,
usb_pipedevice(urb->pipe),
usb_pipeendpoint(urb->pipe),
speed,
--
1.8.4.rc3
_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
