git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 2.0 rc7
[linux-2.6.git]
/
drivers
/
usb
/
host
/
uhci-debug.c
diff --git
a/drivers/usb/host/uhci-debug.c
b/drivers/usb/host/uhci-debug.c
index
397ec79
..
24c73c5
100644
(file)
--- a/
drivers/usb/host/uhci-debug.c
+++ b/
drivers/usb/host/uhci-debug.c
@@
-17,6
+17,8
@@
#include "uhci-hcd.h"
#include "uhci-hcd.h"
+static struct dentry *uhci_debugfs_root = NULL;
+
/* Handle REALLY large printk's so we don't overflow buffers */
static inline void lprintk(char *buf)
{
/* Handle REALLY large printk's so we don't overflow buffers */
static inline void lprintk(char *buf)
{
@@
-404,7
+406,7
@@
static int uhci_sprint_schedule(struct uhci_hcd *uhci, char *buf, int len)
struct uhci_td *td;
struct list_head *tmp, *head;
struct uhci_td *td;
struct list_head *tmp, *head;
- spin_lock_irqsave(&uhci->
schedule_
lock, flags);
+ spin_lock_irqsave(&uhci->lock, flags);
out += sprintf(out, "HC status\n");
out += uhci_show_status(uhci, out, len - (out - buf));
out += sprintf(out, "HC status\n");
out += uhci_show_status(uhci, out, len - (out - buf));
@@
-490,15
+492,13
@@
static int uhci_sprint_schedule(struct uhci_hcd *uhci, char *buf, int len)
if (debug > 2)
out += uhci_show_lists(uhci, out, len - (out - buf));
if (debug > 2)
out += uhci_show_lists(uhci, out, len - (out - buf));
- spin_unlock_irqrestore(&uhci->
schedule_
lock, flags);
+ spin_unlock_irqrestore(&uhci->lock, flags);
return out - buf;
}
#define MAX_OUTPUT (64 * 1024)
return out - buf;
}
#define MAX_OUTPUT (64 * 1024)
-static struct dentry *uhci_debugfs_root = NULL;
-
struct uhci_debug {
int size;
char *data;
struct uhci_debug {
int size;
char *data;
@@
-579,4
+579,9
@@
static struct file_operations uhci_debug_operations = {
.read = uhci_debug_read,
.release = uhci_debug_release,
};
.read = uhci_debug_read,
.release = uhci_debug_release,
};
+
+#else /* CONFIG_DEBUG_FS */
+
+#define uhci_debug_operations (* (struct file_operations *) NULL)
+
#endif
#endif