This looks fine. In your next revision (assuming you don't change this patch), please add: Acked-by: Sarah Sharp <sarah.a.sharp@xxxxxxxxxxxxxxx> I'll change it to Signed-off-by when it hits my xHCI tree. Sarah Sharp On Fri, Aug 23, 2013 at 11:15:01AM +0300, Xenia Ragiadakou wrote: > This patch removes the "adjective" argument from xhci_giveback_urb_in_irq(), > since it is not used in the function anymore. > > Signed-off-by: Xenia Ragiadakou <burzalodowa@xxxxxxxxx> > --- > > Differences from version 2: > > The original patchset was splitted into multiple 'single change' > patches to help patch review. Also, there were added some cleanup > patches that change the existed command handlers to use the new > variables created. > Finally, in the patchset was added the patch for missed periodic > transfer trace so that it can be applied cleanly over the previous > patches, since it affects the same file. > > drivers/usb/host/xhci-ring.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c > index 7b35af1..ddbda35 100644 > --- a/drivers/usb/host/xhci-ring.c > +++ b/drivers/usb/host/xhci-ring.c > @@ -716,7 +716,7 @@ static void xhci_stop_watchdog_timer_in_irq(struct xhci_hcd *xhci, > > /* Must be called with xhci->lock held in interrupt context */ > static void xhci_giveback_urb_in_irq(struct xhci_hcd *xhci, > - struct xhci_td *cur_td, int status, char *adjective) > + struct xhci_td *cur_td, int status) > { > struct usb_hcd *hcd; > struct urb *urb; > @@ -877,7 +877,7 @@ remove_finished_td: > /* Doesn't matter what we pass for status, since the core will > * just overwrite it (because the URB has been unlinked). > */ > - xhci_giveback_urb_in_irq(xhci, cur_td, 0, "cancelled"); > + xhci_giveback_urb_in_irq(xhci, cur_td, 0); > > /* Stop processing the cancelled list if the watchdog timer is > * running. > @@ -987,7 +987,7 @@ void xhci_stop_endpoint_command_watchdog(unsigned long arg) > if (!list_empty(&cur_td->cancelled_td_list)) > list_del_init(&cur_td->cancelled_td_list); > xhci_giveback_urb_in_irq(xhci, cur_td, > - -ESHUTDOWN, "killed"); > + -ESHUTDOWN); > } > while (!list_empty(&temp_ep->cancelled_td_list)) { > cur_td = list_first_entry( > @@ -996,7 +996,7 @@ void xhci_stop_endpoint_command_watchdog(unsigned long arg) > cancelled_td_list); > list_del_init(&cur_td->cancelled_td_list); > xhci_giveback_urb_in_irq(xhci, cur_td, > - -ESHUTDOWN, "killed"); > + -ESHUTDOWN); > } > } > } > -- > 1.8.3.4 > -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html