Commit 0ada24a4 authored by Oliver Neukum's avatar Oliver Neukum Committed by Greg Kroah-Hartman

fusbh200: always build debugfs support

This gets rid of conditional compilation.
Signed-off-by: default avatarOliver Neukum <oneukum@suse.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent be5ac4c4
...@@ -159,8 +159,6 @@ static inline void dbg_hcc_params (struct fusbh200_hcd *fusbh200, char *label) { ...@@ -159,8 +159,6 @@ static inline void dbg_hcc_params (struct fusbh200_hcd *fusbh200, char *label) {
#endif #endif
#ifdef DEBUG
static void __maybe_unused static void __maybe_unused
dbg_qtd (const char *label, struct fusbh200_hcd *fusbh200, struct fusbh200_qtd *qtd) dbg_qtd (const char *label, struct fusbh200_hcd *fusbh200, struct fusbh200_qtd *qtd)
{ {
...@@ -302,29 +300,6 @@ dbg_port_buf (char *buf, unsigned len, const char *label, int port, u32 status) ...@@ -302,29 +300,6 @@ dbg_port_buf (char *buf, unsigned len, const char *label, int port, u32 status)
(status & PORT_CONNECT) ? " CONNECT" : ""); (status & PORT_CONNECT) ? " CONNECT" : "");
} }
#else
static inline void __maybe_unused
dbg_qh (char *label, struct fusbh200_hcd *fusbh200, struct fusbh200_qh *qh)
{}
static inline int __maybe_unused
dbg_status_buf (char *buf, unsigned len, const char *label, u32 status)
{ return 0; }
static inline int __maybe_unused
dbg_command_buf (char *buf, unsigned len, const char *label, u32 command)
{ return 0; }
static inline int __maybe_unused
dbg_intr_buf (char *buf, unsigned len, const char *label, u32 enable)
{ return 0; }
static inline int __maybe_unused
dbg_port_buf (char *buf, unsigned len, const char *label, int port, u32 status)
{ return 0; }
#endif /* DEBUG */
/* functions have the "wrong" filename when they're output... */ /* functions have the "wrong" filename when they're output... */
#define dbg_status(fusbh200, label, status) { \ #define dbg_status(fusbh200, label, status) { \
char _buf [80]; \ char _buf [80]; \
...@@ -5936,13 +5911,11 @@ static int __init fusbh200_hcd_init(void) ...@@ -5936,13 +5911,11 @@ static int __init fusbh200_hcd_init(void)
sizeof(struct fusbh200_qh), sizeof(struct fusbh200_qtd), sizeof(struct fusbh200_qh), sizeof(struct fusbh200_qtd),
sizeof(struct fusbh200_itd)); sizeof(struct fusbh200_itd));
#ifdef DEBUG
fusbh200_debug_root = debugfs_create_dir("fusbh200", usb_debug_root); fusbh200_debug_root = debugfs_create_dir("fusbh200", usb_debug_root);
if (!fusbh200_debug_root) { if (!fusbh200_debug_root) {
retval = -ENOENT; retval = -ENOENT;
goto err_debug; goto err_debug;
} }
#endif
retval = platform_driver_register(&fusbh200_hcd_fusbh200_driver); retval = platform_driver_register(&fusbh200_hcd_fusbh200_driver);
if (retval < 0) if (retval < 0)
...@@ -5951,11 +5924,9 @@ static int __init fusbh200_hcd_init(void) ...@@ -5951,11 +5924,9 @@ static int __init fusbh200_hcd_init(void)
platform_driver_unregister(&fusbh200_hcd_fusbh200_driver); platform_driver_unregister(&fusbh200_hcd_fusbh200_driver);
clean: clean:
#ifdef DEBUG
debugfs_remove(fusbh200_debug_root); debugfs_remove(fusbh200_debug_root);
fusbh200_debug_root = NULL; fusbh200_debug_root = NULL;
err_debug: err_debug:
#endif
clear_bit(USB_EHCI_LOADED, &usb_hcds_loaded); clear_bit(USB_EHCI_LOADED, &usb_hcds_loaded);
return retval; return retval;
} }
...@@ -5964,9 +5935,7 @@ module_init(fusbh200_hcd_init); ...@@ -5964,9 +5935,7 @@ module_init(fusbh200_hcd_init);
static void __exit fusbh200_hcd_cleanup(void) static void __exit fusbh200_hcd_cleanup(void)
{ {
platform_driver_unregister(&fusbh200_hcd_fusbh200_driver); platform_driver_unregister(&fusbh200_hcd_fusbh200_driver);
#ifdef DEBUG
debugfs_remove(fusbh200_debug_root); debugfs_remove(fusbh200_debug_root);
#endif
clear_bit(USB_EHCI_LOADED, &usb_hcds_loaded); clear_bit(USB_EHCI_LOADED, &usb_hcds_loaded);
} }
module_exit(fusbh200_hcd_cleanup); module_exit(fusbh200_hcd_cleanup);
...@@ -173,9 +173,7 @@ struct fusbh200_hcd { /* one per controller */ ...@@ -173,9 +173,7 @@ struct fusbh200_hcd { /* one per controller */
#endif #endif
/* debug files */ /* debug files */
#ifdef DEBUG
struct dentry *debug_dir; struct dentry *debug_dir;
#endif
}; };
/* convert between an HCD pointer and the corresponding FUSBH200_HCD */ /* convert between an HCD pointer and the corresponding FUSBH200_HCD */
...@@ -734,10 +732,4 @@ static inline unsigned fusbh200_read_frame_index(struct fusbh200_hcd *fusbh200) ...@@ -734,10 +732,4 @@ static inline unsigned fusbh200_read_frame_index(struct fusbh200_hcd *fusbh200)
}) })
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
#ifndef DEBUG
#define STUB_DEBUG_FILES
#endif /* DEBUG */
/*-------------------------------------------------------------------------*/
#endif /* __LINUX_FUSBH200_H */ #endif /* __LINUX_FUSBH200_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment