1 files changed, 14 insertions, 10 deletions

diff --git a/drivers/usb/host/ehci-dbg.c b/drivers/usb/host/ehci-dbg.c
index 7561966fbdc4..f0c00de035ef 100644
--- a/drivers/usb/host/ehci-dbg.c
+++ b/drivers/usb/host/ehci-dbg.c
@@ -404,9 +404,9 @@ struct debug_buffer {
 
 #define speed_char(info1) ({ char tmp; \
                 switch (info1 & (3 << 12)) { \
-                case 0 << 12: tmp = 'f'; break; \
-                case 1 << 12: tmp = 'l'; break; \
-                case 2 << 12: tmp = 'h'; break; \
+                case QH_FULL_SPEED: tmp = 'f'; break; \
+                case QH_LOW_SPEED:  tmp = 'l'; break; \
+                case QH_HIGH_SPEED: tmp = 'h'; break; \
                 default: tmp = '?'; break; \
                 }; tmp; })
 
@@ -538,12 +538,13 @@ static ssize_t fill_async_buffer(struct debug_buffer *buf)
         spin_lock_irqsave (&ehci->lock, flags);
         for (qh = ehci->async->qh_next.qh; size > 0 && qh; qh = qh->qh_next.qh)
                 qh_lines (ehci, qh, &next, &size);
-        if (ehci->reclaim && size > 0) {
-                temp = scnprintf (next, size, "\nreclaim =\n");
+        if (ehci->async_unlink && size > 0) {
+                temp = scnprintf(next, size, "\nunlink =\n");
                 size -= temp;
                 next += temp;
 
-                for (qh = ehci->reclaim; size > 0 && qh; qh = qh->reclaim)
+                for (qh = ehci->async_unlink; size > 0 && qh;
+                                qh = qh->unlink_next)
                         qh_lines (ehci, qh, &next, &size);
         }
         spin_unlock_irqrestore (&ehci->lock, flags);
@@ -705,6 +706,8 @@ static const char *rh_state_string(struct ehci_hcd *ehci)
                 return "suspended";
         case EHCI_RH_RUNNING:
                 return "running";
+        case EHCI_RH_STOPPING:
+                return "stopping";
         }
         return "?";
 }
@@ -841,16 +844,17 @@ static ssize_t fill_registers_buffer(struct debug_buffer *buf)
                 }
         }
 
-        if (ehci->reclaim) {
-                temp = scnprintf(next, size, "reclaim qh %p\n", ehci->reclaim);
+        if (ehci->async_unlink) {
+                temp = scnprintf(next, size, "async unlink qh %p\n",
+                                ehci->async_unlink);
                 size -= temp;
                 next += temp;
         }
 
 #ifdef EHCI_STATS
         temp = scnprintf (next, size,
-                "irq normal %ld err %ld reclaim %ld (lost %ld)\n",
-                ehci->stats.normal, ehci->stats.error, ehci->stats.reclaim,
+                "irq normal %ld err %ld iaa %ld (lost %ld)\n",
+                ehci->stats.normal, ehci->stats.error, ehci->stats.iaa,
                 ehci->stats.lost_iaa);
         size -= temp;
         next += temp;