diff options
author | Xenia Ragiadakou <burzalodowa@gmail.com> | 2013-08-29 04:45:13 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-30 15:02:07 -0400 |
commit | 1512c91f1c7633b031f69d43f1d3523b29e77593 (patch) | |
tree | 59c62ddb215303d2ddd172b1ef6d166376615736 /drivers/usb/host/ehci-hcd.c | |
parent | fea26ef095cc74f1e11c046a7bf4a29160f8ffb3 (diff) |
ehci: enable debugging code when CONFIG_DYNAMIC_DEBUG is set
The debugging code for ehci is enabled to run if the DEBUG flag is defined.
This patch enables the debugging code also when the kernel is configured
with dynamic debugging on.
Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com>
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host/ehci-hcd.c')
-rw-r--r-- | drivers/usb/host/ehci-hcd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index 73c72997cd4f..103d0767b673 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c | |||
@@ -1300,7 +1300,7 @@ static int __init ehci_hcd_init(void) | |||
1300 | sizeof(struct ehci_qh), sizeof(struct ehci_qtd), | 1300 | sizeof(struct ehci_qh), sizeof(struct ehci_qtd), |
1301 | sizeof(struct ehci_itd), sizeof(struct ehci_sitd)); | 1301 | sizeof(struct ehci_itd), sizeof(struct ehci_sitd)); |
1302 | 1302 | ||
1303 | #ifdef DEBUG | 1303 | #if defined(DEBUG) || defined(CONFIG_DYNAMIC_DEBUG) |
1304 | ehci_debug_root = debugfs_create_dir("ehci", usb_debug_root); | 1304 | ehci_debug_root = debugfs_create_dir("ehci", usb_debug_root); |
1305 | if (!ehci_debug_root) { | 1305 | if (!ehci_debug_root) { |
1306 | retval = -ENOENT; | 1306 | retval = -ENOENT; |
@@ -1349,7 +1349,7 @@ clean2: | |||
1349 | platform_driver_unregister(&PLATFORM_DRIVER); | 1349 | platform_driver_unregister(&PLATFORM_DRIVER); |
1350 | clean0: | 1350 | clean0: |
1351 | #endif | 1351 | #endif |
1352 | #ifdef DEBUG | 1352 | #if defined(DEBUG) || defined(CONFIG_DYNAMIC_DEBUG) |
1353 | debugfs_remove(ehci_debug_root); | 1353 | debugfs_remove(ehci_debug_root); |
1354 | ehci_debug_root = NULL; | 1354 | ehci_debug_root = NULL; |
1355 | err_debug: | 1355 | err_debug: |
@@ -1373,7 +1373,7 @@ static void __exit ehci_hcd_cleanup(void) | |||
1373 | #ifdef PS3_SYSTEM_BUS_DRIVER | 1373 | #ifdef PS3_SYSTEM_BUS_DRIVER |
1374 | ps3_ehci_driver_unregister(&PS3_SYSTEM_BUS_DRIVER); | 1374 | ps3_ehci_driver_unregister(&PS3_SYSTEM_BUS_DRIVER); |
1375 | #endif | 1375 | #endif |
1376 | #ifdef DEBUG | 1376 | #if defined(DEBUG) || defined(CONFIG_DYNAMIC_DEBUG) |
1377 | debugfs_remove(ehci_debug_root); | 1377 | debugfs_remove(ehci_debug_root); |
1378 | #endif | 1378 | #endif |
1379 | clear_bit(USB_EHCI_LOADED, &usb_hcds_loaded); | 1379 | clear_bit(USB_EHCI_LOADED, &usb_hcds_loaded); |