diff options
| -rw-r--r-- | drivers/staging/octeon-usb/octeon-hcd.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/drivers/staging/octeon-usb/octeon-hcd.c b/drivers/staging/octeon-usb/octeon-hcd.c index a2308029001e..0f5744e250cf 100644 --- a/drivers/staging/octeon-usb/octeon-hcd.c +++ b/drivers/staging/octeon-usb/octeon-hcd.c @@ -1840,16 +1840,14 @@ static void cvmx_usb_start_channel(struct cvmx_usb_state *usb, int channel, * Find a pipe that is ready to be scheduled to hardware. * @usb: USB device state populated by cvmx_usb_initialize(). * @list: Pipe list to search - * @current_frame: - * Frame counter to use as a time reference. * * Returns: Pipe or NULL if none are ready */ static struct cvmx_usb_pipe *cvmx_usb_find_ready_pipe( struct cvmx_usb_state *usb, - struct list_head *list, - u64 current_frame) + struct list_head *list) { + u64 current_frame = usb->frame_number; struct cvmx_usb_pipe *pipe; list_for_each_entry(pipe, list, node) { @@ -1917,21 +1915,17 @@ static void cvmx_usb_schedule(struct cvmx_usb_state *usb, int is_sof) * beginning of the frame */ pipe = cvmx_usb_find_ready_pipe(usb, - usb->active_pipes + CVMX_USB_TRANSFER_ISOCHRONOUS, - usb->frame_number); + usb->active_pipes + CVMX_USB_TRANSFER_ISOCHRONOUS); if (likely(!pipe)) pipe = cvmx_usb_find_ready_pipe(usb, - usb->active_pipes + CVMX_USB_TRANSFER_INTERRUPT, - usb->frame_number); + usb->active_pipes + CVMX_USB_TRANSFER_INTERRUPT); } if (likely(!pipe)) { pipe = cvmx_usb_find_ready_pipe(usb, - usb->active_pipes + CVMX_USB_TRANSFER_CONTROL, - usb->frame_number); + usb->active_pipes + CVMX_USB_TRANSFER_CONTROL); if (likely(!pipe)) pipe = cvmx_usb_find_ready_pipe(usb, - usb->active_pipes + CVMX_USB_TRANSFER_BULK, - usb->frame_number); + usb->active_pipes + CVMX_USB_TRANSFER_BULK); } if (!pipe) break; |