diff options
| author | Alan Stern <stern@rowland.harvard.edu> | 2012-10-10 15:07:30 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-24 17:45:17 -0400 |
| commit | d6064aca824b81fbb788fd230c88976d84b651b1 (patch) | |
| tree | cc731a0a6987ad1eea89ff35fea425e5fa233df4 /drivers/usb/host | |
| parent | 6273f1810f95f4deeb2f0d6810f301726ad32308 (diff) | |
USB: EHCI: move logging macros to ehci.h
In preparation for splitting the ehci-hcd driver into a core library
and separate platform-specific driver modules, this patch (as1616)
moves the console logging macros from ehci-dbg.c to ehci.h, where they
will be available to the platform drivers.
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')
| -rw-r--r-- | drivers/usb/host/ehci-dbg.c | 15 | ||||
| -rw-r--r-- | drivers/usb/host/ehci.h | 15 |
2 files changed, 15 insertions, 15 deletions
diff --git a/drivers/usb/host/ehci-dbg.c b/drivers/usb/host/ehci-dbg.c index 1599806e3d4..dfd3bf3aa4d 100644 --- a/drivers/usb/host/ehci-dbg.c +++ b/drivers/usb/host/ehci-dbg.c | |||
| @@ -18,21 +18,6 @@ | |||
| 18 | 18 | ||
| 19 | /* this file is part of ehci-hcd.c */ | 19 | /* this file is part of ehci-hcd.c */ |
| 20 | 20 | ||
| 21 | #define ehci_dbg(ehci, fmt, args...) \ | ||
| 22 | dev_dbg (ehci_to_hcd(ehci)->self.controller , fmt , ## args ) | ||
| 23 | #define ehci_err(ehci, fmt, args...) \ | ||
| 24 | dev_err (ehci_to_hcd(ehci)->self.controller , fmt , ## args ) | ||
| 25 | #define ehci_info(ehci, fmt, args...) \ | ||
| 26 | dev_info (ehci_to_hcd(ehci)->self.controller , fmt , ## args ) | ||
| 27 | #define ehci_warn(ehci, fmt, args...) \ | ||
| 28 | dev_warn (ehci_to_hcd(ehci)->self.controller , fmt , ## args ) | ||
| 29 | |||
| 30 | #ifdef VERBOSE_DEBUG | ||
| 31 | # define ehci_vdbg ehci_dbg | ||
| 32 | #else | ||
| 33 | static inline void ehci_vdbg(struct ehci_hcd *ehci, ...) {} | ||
| 34 | #endif | ||
| 35 | |||
| 36 | #ifdef DEBUG | 21 | #ifdef DEBUG |
| 37 | 22 | ||
| 38 | /* check the values in the HCSPARAMS register | 23 | /* check the values in the HCSPARAMS register |
diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h index 4ddf7c51616..9b8cbb4b3e2 100644 --- a/drivers/usb/host/ehci.h +++ b/drivers/usb/host/ehci.h | |||
| @@ -761,6 +761,21 @@ static inline u32 hc32_to_cpup (const struct ehci_hcd *ehci, const __hc32 *x) | |||
| 761 | 761 | ||
| 762 | /*-------------------------------------------------------------------------*/ | 762 | /*-------------------------------------------------------------------------*/ |
| 763 | 763 | ||
| 764 | #define ehci_dbg(ehci, fmt, args...) \ | ||
| 765 | dev_dbg(ehci_to_hcd(ehci)->self.controller , fmt , ## args) | ||
| 766 | #define ehci_err(ehci, fmt, args...) \ | ||
| 767 | dev_err(ehci_to_hcd(ehci)->self.controller , fmt , ## args) | ||
| 768 | #define ehci_info(ehci, fmt, args...) \ | ||
| 769 | dev_info(ehci_to_hcd(ehci)->self.controller , fmt , ## args) | ||
| 770 | #define ehci_warn(ehci, fmt, args...) \ | ||
| 771 | dev_warn(ehci_to_hcd(ehci)->self.controller , fmt , ## args) | ||
| 772 | |||
| 773 | #ifdef VERBOSE_DEBUG | ||
| 774 | # define ehci_vdbg ehci_dbg | ||
| 775 | #else | ||
| 776 | static inline void ehci_vdbg(struct ehci_hcd *ehci, ...) {} | ||
| 777 | #endif | ||
| 778 | |||
| 764 | #ifdef CONFIG_PCI | 779 | #ifdef CONFIG_PCI |
| 765 | 780 | ||
| 766 | /* For working around the MosChip frame-index-register bug */ | 781 | /* For working around the MosChip frame-index-register bug */ |