aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/host
diff options
context:
space:
mode:
authorChris Rorvick <chris@rorvick.com>2014-11-04 20:18:52 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-11-07 12:02:38 -0500
commitb1f6ccf580a9c547d0299561149c6a03c833515a (patch)
tree73a5ff49e9eaab223105cd0abdb3710ba1f9a3bb /drivers/usb/host
parent0fa57f01278b78174848ca628ca9a87c4dd37696 (diff)
fotg210: Remove duplicate ehci-dbgp declarations
Now that ehci-dbgp has its own header, use it rather than duplicating the declarations, etc. Signed-off-by: Chris Rorvick <chris@rorvick.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host')
-rw-r--r--drivers/usb/host/fotg210.h40
1 files changed, 2 insertions, 38 deletions
diff --git a/drivers/usb/host/fotg210.h b/drivers/usb/host/fotg210.h
index c2e513495704..975d9bb25858 100644
--- a/drivers/usb/host/fotg210.h
+++ b/drivers/usb/host/fotg210.h
@@ -1,6 +1,8 @@
1#ifndef __LINUX_FOTG210_H 1#ifndef __LINUX_FOTG210_H
2#define __LINUX_FOTG210_H 2#define __LINUX_FOTG210_H
3 3
4#include <linux/usb/ehci-dbgp.h>
5
4/* definitions used for the EHCI driver */ 6/* definitions used for the EHCI driver */
5 7
6/* 8/*
@@ -304,44 +306,6 @@ struct fotg210_dbg_port {
304 u32 address; 306 u32 address;
305}; 307};
306 308
307#ifdef CONFIG_EARLY_PRINTK_DBGP
308#include <linux/init.h>
309extern int __init early_dbgp_init(char *s);
310extern struct console early_dbgp_console;
311#endif /* CONFIG_EARLY_PRINTK_DBGP */
312
313struct usb_hcd;
314
315#ifdef CONFIG_XEN_DOM0
316extern int xen_dbgp_reset_prep(struct usb_hcd *);
317extern int xen_dbgp_external_startup(struct usb_hcd *);
318#else
319static inline int xen_dbgp_reset_prep(struct usb_hcd *hcd)
320{
321 return 1; /* Shouldn't this be 0? */
322}
323
324static inline int xen_dbgp_external_startup(struct usb_hcd *hcd)
325{
326 return -1;
327}
328#endif
329
330#ifdef CONFIG_EARLY_PRINTK_DBGP
331/* Call backs from fotg210 host driver to fotg210 debug driver */
332extern int dbgp_external_startup(struct usb_hcd *);
333extern int dbgp_reset_prep(struct usb_hcd *hcd);
334#else
335static inline int dbgp_reset_prep(struct usb_hcd *hcd)
336{
337 return xen_dbgp_reset_prep(hcd);
338}
339static inline int dbgp_external_startup(struct usb_hcd *hcd)
340{
341 return xen_dbgp_external_startup(hcd);
342}
343#endif
344
345/*-------------------------------------------------------------------------*/ 309/*-------------------------------------------------------------------------*/
346 310
347#define QTD_NEXT(fotg210, dma) cpu_to_hc32(fotg210, (u32)dma) 311#define QTD_NEXT(fotg210, dma) cpu_to_hc32(fotg210, (u32)dma)