diff options
author | Oliver Neukum <oneukum@suse.de> | 2013-11-18 07:23:03 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-03 13:28:39 -0500 |
commit | a90b8fc6f477ef40bd7a50354ce4ae029d8c70c5 (patch) | |
tree | 645bb91b2c0133e7760081b9c3b436de4edf6203 | |
parent | 991fb3daac946441dbf4c237b2dd4d6c11fff633 (diff) |
fotg210: remove conditional compilation
Always compile in the debugfs support
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/usb/host/fotg210-hcd.c | 8 | ||||
-rw-r--r-- | drivers/usb/host/fotg210.h | 8 |
2 files changed, 0 insertions, 16 deletions
diff --git a/drivers/usb/host/fotg210-hcd.c b/drivers/usb/host/fotg210-hcd.c index 55486bd23cf1..3af053343cf4 100644 --- a/drivers/usb/host/fotg210-hcd.c +++ b/drivers/usb/host/fotg210-hcd.c | |||
@@ -352,13 +352,6 @@ dbg_port_buf(char *buf, unsigned len, const char *label, int port, u32 status) | |||
352 | 352 | ||
353 | /*-------------------------------------------------------------------------*/ | 353 | /*-------------------------------------------------------------------------*/ |
354 | 354 | ||
355 | #ifdef STUB_DEBUG_FILES | ||
356 | |||
357 | static inline void create_debug_files(struct fotg210_hcd *bus) { } | ||
358 | static inline void remove_debug_files(struct fotg210_hcd *bus) { } | ||
359 | |||
360 | #else | ||
361 | |||
362 | /* troubleshooting help: expose state in debugfs */ | 355 | /* troubleshooting help: expose state in debugfs */ |
363 | 356 | ||
364 | static int debug_async_open(struct inode *, struct file *); | 357 | static int debug_async_open(struct inode *, struct file *); |
@@ -954,7 +947,6 @@ static inline void remove_debug_files(struct fotg210_hcd *fotg210) | |||
954 | debugfs_remove_recursive(fotg210->debug_dir); | 947 | debugfs_remove_recursive(fotg210->debug_dir); |
955 | } | 948 | } |
956 | 949 | ||
957 | #endif /* STUB_DEBUG_FILES */ | ||
958 | /*-------------------------------------------------------------------------*/ | 950 | /*-------------------------------------------------------------------------*/ |
959 | 951 | ||
960 | /* | 952 | /* |
diff --git a/drivers/usb/host/fotg210.h b/drivers/usb/host/fotg210.h index 8920f9d32564..ac6cd1bfd208 100644 --- a/drivers/usb/host/fotg210.h +++ b/drivers/usb/host/fotg210.h | |||
@@ -174,9 +174,7 @@ struct fotg210_hcd { /* one per controller */ | |||
174 | #endif | 174 | #endif |
175 | 175 | ||
176 | /* debug files */ | 176 | /* debug files */ |
177 | #ifdef DEBUG | ||
178 | struct dentry *debug_dir; | 177 | struct dentry *debug_dir; |
179 | #endif | ||
180 | }; | 178 | }; |
181 | 179 | ||
182 | /* convert between an HCD pointer and the corresponding FOTG210_HCD */ | 180 | /* convert between an HCD pointer and the corresponding FOTG210_HCD */ |
@@ -741,10 +739,4 @@ static inline unsigned fotg210_read_frame_index(struct fotg210_hcd *fotg210) | |||
741 | }) | 739 | }) |
742 | /*-------------------------------------------------------------------------*/ | 740 | /*-------------------------------------------------------------------------*/ |
743 | 741 | ||
744 | #ifndef DEBUG | ||
745 | #define STUB_DEBUG_FILES | ||
746 | #endif /* DEBUG */ | ||
747 | |||
748 | /*-------------------------------------------------------------------------*/ | ||
749 | |||
750 | #endif /* __LINUX_FOTG210_H */ | 742 | #endif /* __LINUX_FOTG210_H */ |