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.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h
index 1a782775881b..303c36cc99c9 100644
--- a/drivers/usb/host/ehci.h
+++ b/drivers/usb/host/ehci.h
@@ -84,6 +84,7 @@ enum ehci_hrtimer_event {
84 EHCI_HRTIMER_POLL_DEAD, /* Wait for dead controller to stop */ 84 EHCI_HRTIMER_POLL_DEAD, /* Wait for dead controller to stop */
85 EHCI_HRTIMER_UNLINK_INTR, /* Wait for interrupt QH unlink */ 85 EHCI_HRTIMER_UNLINK_INTR, /* Wait for interrupt QH unlink */
86 EHCI_HRTIMER_FREE_ITDS, /* Wait for unused iTDs and siTDs */ 86 EHCI_HRTIMER_FREE_ITDS, /* Wait for unused iTDs and siTDs */
87 EHCI_HRTIMER_ASYNC_UNLINKS, /* Unlink empty async QHs */
87 EHCI_HRTIMER_IAA_WATCHDOG, /* Handle lost IAA interrupts */ 88 EHCI_HRTIMER_IAA_WATCHDOG, /* Handle lost IAA interrupts */
88 EHCI_HRTIMER_DISABLE_PERIODIC, /* Wait to disable periodic sched */ 89 EHCI_HRTIMER_DISABLE_PERIODIC, /* Wait to disable periodic sched */
89 EHCI_HRTIMER_DISABLE_ASYNC, /* Wait to disable async sched */ 90 EHCI_HRTIMER_DISABLE_ASYNC, /* Wait to disable async sched */
@@ -123,6 +124,7 @@ struct ehci_hcd { /* one per controller */
123 struct ehci_qh *async_unlink_last; 124 struct ehci_qh *async_unlink_last;
124 struct ehci_qh *async_iaa; 125 struct ehci_qh *async_iaa;
125 struct ehci_qh *qh_scan_next; 126 struct ehci_qh *qh_scan_next;
127 unsigned async_unlink_cycle;
126 unsigned async_count; /* async activity count */ 128 unsigned async_count; /* async activity count */
127 129
128 /* periodic schedule support */ 130 /* periodic schedule support */
@@ -232,7 +234,6 @@ static inline struct usb_hcd *ehci_to_hcd (struct ehci_hcd *ehci)
232 234
233enum ehci_timer_action { 235enum ehci_timer_action {
234 TIMER_IO_WATCHDOG, 236 TIMER_IO_WATCHDOG,
235 TIMER_ASYNC_SHRINK,
236}; 237};
237 238
238static inline void 239static inline void
@@ -382,7 +383,6 @@ struct ehci_qh {
382 struct ehci_qtd *dummy; 383 struct ehci_qtd *dummy;
383 struct ehci_qh *unlink_next; /* next on unlink list */ 384 struct ehci_qh *unlink_next; /* next on unlink list */
384 385
385 unsigned long unlink_time;
386 unsigned unlink_cycle; 386 unsigned unlink_cycle;
387 unsigned stamp; 387 unsigned stamp;
388 388