OSDN Git Service

staging: octeon-usb: eliminate redundant parameter from find_ready_pipe
authorAaro Koskinen <aaro.koskinen@iki.fi>
Fri, 26 Feb 2016 00:13:53 +0000 (02:13 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 26 Feb 2016 06:38:16 +0000 (22:38 -0800)
current_frame always equals usb->frame_number.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/octeon-usb/octeon-hcd.c

index a230802..0f5744e 100644 (file)
@@ -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;