diff options
Diffstat (limited to 'drivers/usb/host/ehci-dbg.c')
-rw-r--r-- | drivers/usb/host/ehci-dbg.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/usb/host/ehci-dbg.c b/drivers/usb/host/ehci-dbg.c index 4a9c2edbcb2b..524cbf26d992 100644 --- a/drivers/usb/host/ehci-dbg.c +++ b/drivers/usb/host/ehci-dbg.c | |||
@@ -18,7 +18,7 @@ | |||
18 | 18 | ||
19 | /* this file is part of ehci-hcd.c */ | 19 | /* this file is part of ehci-hcd.c */ |
20 | 20 | ||
21 | #if defined(DEBUG) || defined(CONFIG_DYNAMIC_DEBUG) | 21 | #ifdef CONFIG_DYNAMIC_DEBUG |
22 | 22 | ||
23 | /* check the values in the HCSPARAMS register | 23 | /* check the values in the HCSPARAMS register |
24 | * (host controller _Structural_ parameters) | 24 | * (host controller _Structural_ parameters) |
@@ -62,7 +62,7 @@ static inline void dbg_hcs_params (struct ehci_hcd *ehci, char *label) {} | |||
62 | 62 | ||
63 | #endif | 63 | #endif |
64 | 64 | ||
65 | #if defined(DEBUG) || defined(CONFIG_DYNAMIC_DEBUG) | 65 | #ifdef CONFIG_DYNAMIC_DEBUG |
66 | 66 | ||
67 | /* check the values in the HCCPARAMS register | 67 | /* check the values in the HCCPARAMS register |
68 | * (host controller _Capability_ parameters) | 68 | * (host controller _Capability_ parameters) |
@@ -101,7 +101,7 @@ static inline void dbg_hcc_params (struct ehci_hcd *ehci, char *label) {} | |||
101 | 101 | ||
102 | #endif | 102 | #endif |
103 | 103 | ||
104 | #if defined(DEBUG) || defined(CONFIG_DYNAMIC_DEBUG) | 104 | #ifdef CONFIG_DYNAMIC_DEBUG |
105 | 105 | ||
106 | static void __maybe_unused | 106 | static void __maybe_unused |
107 | dbg_qtd (const char *label, struct ehci_hcd *ehci, struct ehci_qtd *qtd) | 107 | dbg_qtd (const char *label, struct ehci_hcd *ehci, struct ehci_qtd *qtd) |
@@ -301,7 +301,7 @@ static inline int __maybe_unused | |||
301 | dbg_port_buf (char *buf, unsigned len, const char *label, int port, u32 status) | 301 | dbg_port_buf (char *buf, unsigned len, const char *label, int port, u32 status) |
302 | { return 0; } | 302 | { return 0; } |
303 | 303 | ||
304 | #endif /* DEBUG || CONFIG_DYNAMIC_DEBUG */ | 304 | #endif /* CONFIG_DYNAMIC_DEBUG */ |
305 | 305 | ||
306 | /* functions have the "wrong" filename when they're output... */ | 306 | /* functions have the "wrong" filename when they're output... */ |
307 | #define dbg_status(ehci, label, status) { \ | 307 | #define dbg_status(ehci, label, status) { \ |
@@ -818,7 +818,7 @@ static ssize_t fill_registers_buffer(struct debug_buffer *buf) | |||
818 | 818 | ||
819 | #ifdef CONFIG_PCI | 819 | #ifdef CONFIG_PCI |
820 | /* EHCI 0.96 and later may have "extended capabilities" */ | 820 | /* EHCI 0.96 and later may have "extended capabilities" */ |
821 | if (hcd->self.controller->bus == &pci_bus_type) { | 821 | if (dev_is_pci(hcd->self.controller)) { |
822 | struct pci_dev *pdev; | 822 | struct pci_dev *pdev; |
823 | u32 offset, cap, cap2; | 823 | u32 offset, cap, cap2; |
824 | unsigned count = 256/4; | 824 | unsigned count = 256/4; |