summaryrefslogtreecommitdiffstats
path: root/drivers/usb/host/ehci.h
diff options
context:
space:
mode:
authorAlan Stern <stern@rowland.harvard.edu>2012-10-10 15:07:39 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-10-24 14:45:17 -0700
commitacc08503406f97ce6582c92fd8c8139f1e871a96 (patch)
tree29fff5e0ba8e5bd14c96864ea5475ab6c957c5b4 /drivers/usb/host/ehci.h
parentd6064aca824b81fbb788fd230c88976d84b651b1 (diff)
downloadlinux-acc08503406f97ce6582c92fd8c8139f1e871a96.tar.gz
linux-acc08503406f97ce6582c92fd8c8139f1e871a96.tar.bz2
linux-acc08503406f97ce6582c92fd8c8139f1e871a96.zip
USB: EHCI: make ehci_read_frame_index platform independent
In preparation for splitting the ehci-hcd driver into a core library and separate platform-specific driver modules, this patch (as1617) changes the way ehci_read_frame_index() is handled. Since the same core library will have to work with both PCI and non-PCI platforms, the quirk handler routine will be compiled unconditionally. The decision about whether to call it or simply to read the frame index register is made at run time, based on whether the frame_index_bug quirk flag is set. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Acked-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host/ehci.h')
-rw-r--r--drivers/usb/host/ehci.h16
1 files changed, 0 insertions, 16 deletions
diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h
index 9b8cbb4b3e2c..ec948c3b1cea 100644
--- a/drivers/usb/host/ehci.h
+++ b/drivers/usb/host/ehci.h
@@ -776,22 +776,6 @@ static inline u32 hc32_to_cpup (const struct ehci_hcd *ehci, const __hc32 *x)
static inline void ehci_vdbg(struct ehci_hcd *ehci, ...) {}
#endif
-#ifdef CONFIG_PCI
-
-/* For working around the MosChip frame-index-register bug */
-static unsigned ehci_read_frame_index(struct ehci_hcd *ehci);
-
-#else
-
-static inline unsigned ehci_read_frame_index(struct ehci_hcd *ehci)
-{
- return ehci_readl(ehci, &ehci->regs->frame_index);
-}
-
-#endif
-
-/*-------------------------------------------------------------------------*/
-
#ifndef DEBUG
#define STUB_DEBUG_FILES
#endif /* DEBUG */