aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/host
diff options
context:
space:
mode:
authorXenia Ragiadakou <burzalodowa@gmail.com>2013-09-09 06:29:45 -0400
committerSarah Sharp <sarah.a.sharp@linux.intel.com>2013-10-16 15:24:24 -0400
commit07a37e9e425a3176875a0c91e59ae8bc65d2ddb9 (patch)
tree280c5dabda562b61ca4806469928736286b565af /drivers/usb/host
parentd194c031994d3fc1038fa09e9e92d9be24a21921 (diff)
xhci: remove unused argument from xhci_giveback_urb_in_irq()
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@gmail.com> Acked-by: Sarah Sharp <sarah.a.sharp@linux.intel.com> Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Diffstat (limited to 'drivers/usb/host')
-rw-r--r--drivers/usb/host/xhci-ring.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index 6bfbd80ec2b9..9a6b18e31d83 100644
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -726,7 +726,7 @@ static void xhci_stop_watchdog_timer_in_irq(struct xhci_hcd *xhci,
726 726
727/* Must be called with xhci->lock held in interrupt context */ 727/* Must be called with xhci->lock held in interrupt context */
728static void xhci_giveback_urb_in_irq(struct xhci_hcd *xhci, 728static void xhci_giveback_urb_in_irq(struct xhci_hcd *xhci,
729 struct xhci_td *cur_td, int status, char *adjective) 729 struct xhci_td *cur_td, int status)
730{ 730{
731 struct usb_hcd *hcd; 731 struct usb_hcd *hcd;
732 struct urb *urb; 732 struct urb *urb;
@@ -891,7 +891,7 @@ remove_finished_td:
891 /* Doesn't matter what we pass for status, since the core will 891 /* Doesn't matter what we pass for status, since the core will
892 * just overwrite it (because the URB has been unlinked). 892 * just overwrite it (because the URB has been unlinked).
893 */ 893 */
894 xhci_giveback_urb_in_irq(xhci, cur_td, 0, "cancelled"); 894 xhci_giveback_urb_in_irq(xhci, cur_td, 0);
895 895
896 /* Stop processing the cancelled list if the watchdog timer is 896 /* Stop processing the cancelled list if the watchdog timer is
897 * running. 897 * running.
@@ -1001,7 +1001,7 @@ void xhci_stop_endpoint_command_watchdog(unsigned long arg)
1001 if (!list_empty(&cur_td->cancelled_td_list)) 1001 if (!list_empty(&cur_td->cancelled_td_list))
1002 list_del_init(&cur_td->cancelled_td_list); 1002 list_del_init(&cur_td->cancelled_td_list);
1003 xhci_giveback_urb_in_irq(xhci, cur_td, 1003 xhci_giveback_urb_in_irq(xhci, cur_td,
1004 -ESHUTDOWN, "killed"); 1004 -ESHUTDOWN);
1005 } 1005 }
1006 while (!list_empty(&temp_ep->cancelled_td_list)) { 1006 while (!list_empty(&temp_ep->cancelled_td_list)) {
1007 cur_td = list_first_entry( 1007 cur_td = list_first_entry(
@@ -1010,7 +1010,7 @@ void xhci_stop_endpoint_command_watchdog(unsigned long arg)
1010 cancelled_td_list); 1010 cancelled_td_list);
1011 list_del_init(&cur_td->cancelled_td_list); 1011 list_del_init(&cur_td->cancelled_td_list);
1012 xhci_giveback_urb_in_irq(xhci, cur_td, 1012 xhci_giveback_urb_in_irq(xhci, cur_td,
1013 -ESHUTDOWN, "killed"); 1013 -ESHUTDOWN);
1014 } 1014 }
1015 } 1015 }
1016 } 1016 }