aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/host/ehci.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/usb/host/ehci.h')
-rw-r--r--drivers/usb/host/ehci.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h
index 195449db1b18..3c6c07c0956a 100644
--- a/drivers/usb/host/ehci.h
+++ b/drivers/usb/host/ehci.h
@@ -42,7 +42,7 @@ struct ehci_stats {
42 /* irq usage */ 42 /* irq usage */
43 unsigned long normal; 43 unsigned long normal;
44 unsigned long error; 44 unsigned long error;
45 unsigned long reclaim; 45 unsigned long iaa;
46 unsigned long lost_iaa; 46 unsigned long lost_iaa;
47 47
48 /* termination of urbs from core */ 48 /* termination of urbs from core */
@@ -51,7 +51,7 @@ struct ehci_stats {
51}; 51};
52 52
53/* ehci_hcd->lock guards shared data against other CPUs: 53/* ehci_hcd->lock guards shared data against other CPUs:
54 * ehci_hcd: async, reclaim, periodic (and shadow), ... 54 * ehci_hcd: async, unlink, periodic (and shadow), ...
55 * usb_host_endpoint: hcpriv 55 * usb_host_endpoint: hcpriv
56 * ehci_qh: qh_next, qtd_list 56 * ehci_qh: qh_next, qtd_list
57 * ehci_qtd: qtd_list 57 * ehci_qtd: qtd_list
@@ -81,7 +81,7 @@ struct ehci_hcd { /* one per controller */
81 /* async schedule support */ 81 /* async schedule support */
82 struct ehci_qh *async; 82 struct ehci_qh *async;
83 struct ehci_qh *dummy; /* For AMD quirk use */ 83 struct ehci_qh *dummy; /* For AMD quirk use */
84 struct ehci_qh *reclaim; 84 struct ehci_qh *async_unlink;
85 struct ehci_qh *qh_scan_next; 85 struct ehci_qh *qh_scan_next;
86 unsigned scanning : 1; 86 unsigned scanning : 1;
87 87
@@ -354,7 +354,7 @@ struct ehci_qh {
354 union ehci_shadow qh_next; /* ptr to qh; or periodic */ 354 union ehci_shadow qh_next; /* ptr to qh; or periodic */
355 struct list_head qtd_list; /* sw qtd list */ 355 struct list_head qtd_list; /* sw qtd list */
356 struct ehci_qtd *dummy; 356 struct ehci_qtd *dummy;
357 struct ehci_qh *reclaim; /* next to reclaim */ 357 struct ehci_qh *unlink_next; /* next on unlink list */
358 358
359 unsigned long unlink_time; 359 unsigned long unlink_time;
360 unsigned stamp; 360 unsigned stamp;
@@ -364,7 +364,7 @@ struct ehci_qh {
364#define QH_STATE_LINKED 1 /* HC sees this */ 364#define QH_STATE_LINKED 1 /* HC sees this */
365#define QH_STATE_UNLINK 2 /* HC may still see this */ 365#define QH_STATE_UNLINK 2 /* HC may still see this */
366#define QH_STATE_IDLE 3 /* HC doesn't see this */ 366#define QH_STATE_IDLE 3 /* HC doesn't see this */
367#define QH_STATE_UNLINK_WAIT 4 /* LINKED and on reclaim q */ 367#define QH_STATE_UNLINK_WAIT 4 /* LINKED and on unlink q */
368#define QH_STATE_COMPLETING 5 /* don't touch token.HALT */ 368#define QH_STATE_COMPLETING 5 /* don't touch token.HALT */
369 369
370 u8 xacterrs; /* XactErr retry counter */ 370 u8 xacterrs; /* XactErr retry counter */