| From 38cdfd1d15a427e1010347cbbbd4fe4781427f4e Mon Sep 17 00:00:00 2001 |
| From: Felipe Balbi <felipe.balbi@linux.intel.com> |
| Date: Mon, 23 Jan 2017 14:20:17 +0200 |
| Subject: [PATCH 204/255] usb: host: xhci: convert to |
| list_for_each_entry_safe() |
| |
| instead of using while(!list_empty()) followed by list_first_entry(), we |
| can actually use list_for_each_entry_safe(). |
| |
| Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com> |
| Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| (cherry picked from commit a54cfae3c7727c2c172fdcd5886b4235b833da6c) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/usb/host/xhci-ring.c | 15 ++++++++------- |
| 1 file changed, 8 insertions(+), 7 deletions(-) |
| |
| --- a/drivers/usb/host/xhci-ring.c |
| +++ b/drivers/usb/host/xhci-ring.c |
| @@ -808,11 +808,11 @@ remove_finished_td: |
| static void xhci_kill_ring_urbs(struct xhci_hcd *xhci, struct xhci_ring *ring) |
| { |
| struct xhci_td *cur_td; |
| + struct xhci_td *tmp; |
| |
| - while (!list_empty(&ring->td_list)) { |
| - cur_td = list_first_entry(&ring->td_list, |
| - struct xhci_td, td_list); |
| + list_for_each_entry_safe(cur_td, tmp, &ring->td_list, td_list) { |
| list_del_init(&cur_td->td_list); |
| + |
| if (!list_empty(&cur_td->cancelled_td_list)) |
| list_del_init(&cur_td->cancelled_td_list); |
| |
| @@ -828,6 +828,7 @@ static void xhci_kill_endpoint_urbs(stru |
| int slot_id, int ep_index) |
| { |
| struct xhci_td *cur_td; |
| + struct xhci_td *tmp; |
| struct xhci_virt_ep *ep; |
| struct xhci_ring *ring; |
| |
| @@ -856,12 +857,12 @@ static void xhci_kill_endpoint_urbs(stru |
| slot_id, ep_index); |
| xhci_kill_ring_urbs(xhci, ring); |
| } |
| - while (!list_empty(&ep->cancelled_td_list)) { |
| - cur_td = list_first_entry(&ep->cancelled_td_list, |
| - struct xhci_td, cancelled_td_list); |
| - list_del_init(&cur_td->cancelled_td_list); |
| |
| + list_for_each_entry_safe(cur_td, tmp, &ep->cancelled_td_list, |
| + cancelled_td_list) { |
| + list_del_init(&cur_td->cancelled_td_list); |
| inc_td_cnt(cur_td->urb); |
| + |
| if (last_td_in_urb(cur_td)) |
| xhci_giveback_urb_in_irq(xhci, cur_td, -ESHUTDOWN); |
| } |