USB: EHCI: rename "reclaim"
This patch (as1569) renames the ehci->reclaim list in ehci-hcd. The
word "reclaim" is used in the EHCI specification to mean something
quite different, and "unlink_next" is more descriptive of the list's
purpose anyway.
Similarly, the "reclaim" field in the ehci_stats structure is renamed
"iaa", which is more meaningful (to experts, anyway) and is a better
match for the "lost_iaa" field.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git a/drivers/usb/host/ehci-q.c b/drivers/usb/host/ehci-q.c
index 1565047..8e80cde 100644
--- a/drivers/usb/host/ehci-q.c
+++ b/drivers/usb/host/ehci-q.c
@@ -1153,11 +1153,11 @@
/*-------------------------------------------------------------------------*/
-/* the async qh for the qtds being reclaimed are now unlinked from the HC */
+/* the async qh for the qtds being unlinked are now gone from the HC */
static void end_unlink_async (struct ehci_hcd *ehci)
{
- struct ehci_qh *qh = ehci->reclaim;
+ struct ehci_qh *qh = ehci->async_unlink;
struct ehci_qh *next;
iaa_watchdog_done(ehci);
@@ -1167,9 +1167,9 @@
qh->qh_next.qh = NULL;
/* other unlink(s) may be pending (in QH_STATE_UNLINK_WAIT) */
- next = qh->reclaim;
- ehci->reclaim = next;
- qh->reclaim = NULL;
+ next = qh->unlink_next;
+ ehci->async_unlink = next;
+ qh->unlink_next = NULL;
qh_completions (ehci, qh);
@@ -1185,7 +1185,7 @@
}
if (next) {
- ehci->reclaim = NULL;
+ ehci->async_unlink = NULL;
start_unlink_async (ehci, next);
}
@@ -1203,7 +1203,7 @@
#ifdef DEBUG
assert_spin_locked(&ehci->lock);
- if (ehci->reclaim
+ if (ehci->async_unlink
|| (qh->qh_state != QH_STATE_LINKED
&& qh->qh_state != QH_STATE_UNLINK_WAIT)
)
@@ -1214,7 +1214,7 @@
if (unlikely (qh == ehci->async)) {
/* can't get here without STS_ASS set */
if (ehci->rh_state != EHCI_RH_HALTED
- && !ehci->reclaim) {
+ && !ehci->async_unlink) {
/* ... and CMD_IAAD clear */
ehci->command &= ~CMD_ASE;
ehci_writel(ehci, ehci->command, &ehci->regs->command);
@@ -1226,7 +1226,7 @@
}
qh->qh_state = QH_STATE_UNLINK;
- ehci->reclaim = qh;
+ ehci->async_unlink = qh;
prev = ehci->async;
while (prev->qh_next.qh != qh)
@@ -1240,7 +1240,7 @@
/* If the controller isn't running, we don't have to wait for it */
if (unlikely(ehci->rh_state != EHCI_RH_RUNNING)) {
- /* if (unlikely (qh->reclaim != 0))
+ /* if (unlikely (qh->unlink_next != 0))
* this will recurse, probably not much
*/
end_unlink_async (ehci);
@@ -1295,7 +1295,7 @@
*/
if (list_empty(&qh->qtd_list)
&& qh->qh_state == QH_STATE_LINKED) {
- if (!ehci->reclaim && (stopped ||
+ if (!ehci->async_unlink && (stopped ||
time_after_eq(jiffies, qh->unlink_time)))
start_unlink_async(ehci, qh);
else