Skip to content

Commit

Permalink
USB: EHCI: add pointer to end of async-unlink list
Browse files Browse the repository at this point in the history
This patch (as1570) adds a pointer for the end of ehci-hcd's
async-unlink list.  The list (which is actually a queue) is singly
linked, so having a pointer to its end makes adding new entries easier
-- there's no longer any need to scan through the whole list.

In principle it could be changed to a standard doubly-linked list.  It
turns out that doing so actually makes the code less clear, so I'm
leaving it as is.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Alan Stern authored and Greg Kroah-Hartman committed Jul 16, 2012
1 parent 99ac5b1 commit 2f5bb66
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 7 deletions.
9 changes: 2 additions & 7 deletions drivers/usb/host/ehci-hcd.c
Original file line number Diff line number Diff line change
Expand Up @@ -1041,14 +1041,9 @@ static void unlink_async (struct ehci_hcd *ehci, struct ehci_qh *qh)

/* defer till later if busy */
if (ehci->async_unlink) {
struct ehci_qh *last;

for (last = ehci->async_unlink;
last->unlink_next;
last = last->unlink_next)
continue;
qh->qh_state = QH_STATE_UNLINK_WAIT;
last->unlink_next = qh;
ehci->async_unlink_last->unlink_next = qh;
ehci->async_unlink_last = qh;

/* start IAA cycle */
} else
Expand Down
2 changes: 2 additions & 0 deletions drivers/usb/host/ehci-q.c
Original file line number Diff line number Diff line change
Expand Up @@ -1227,6 +1227,8 @@ static void start_unlink_async (struct ehci_hcd *ehci, struct ehci_qh *qh)

qh->qh_state = QH_STATE_UNLINK;
ehci->async_unlink = qh;
if (!qh->unlink_next)
ehci->async_unlink_last = qh;

prev = ehci->async;
while (prev->qh_next.qh != qh)
Expand Down
1 change: 1 addition & 0 deletions drivers/usb/host/ehci.h
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ struct ehci_hcd { /* one per controller */
struct ehci_qh *async;
struct ehci_qh *dummy; /* For AMD quirk use */
struct ehci_qh *async_unlink;
struct ehci_qh *async_unlink_last;
struct ehci_qh *qh_scan_next;
unsigned scanning : 1;

Expand Down

0 comments on commit 2f5bb66

Please sign in to comment.