[omap35xx] Update u-boot command-line parameters

[openwrt.git] / target / linux / adm5120 / files / drivers / usb / host / adm5120-dbg.c

diff --git a/target/linux/adm5120/files/drivers/usb/host/adm5120-dbg.c b/target/linux/adm5120/files/drivers/usb/host/adm5120-dbg.c
index a6eb67c..ee14817 100644 (file)
--- a/target/linux/adm5120/files/drivers/usb/host/adm5120-dbg.c
+++ b/target/linux/adm5120/files/drivers/usb/host/adm5120-dbg.c
@@ -1,7 +1,7 @@
 /*
  * ADM5120 HCD (Host Controller Driver) for USB
  *
- * Copyright (C) 2007,2008 Gabor Juhos <juhosg at openwrt.org>
+ * Copyright (C) 2007-2008 Gabor Juhos <juhosg@openwrt.org>
  *
  * This file was derived from: drivers/usb/host/ohci-dbg.c
  *   (C) Copyright 1999 Roman Weissgaerber <weissg@vienna.at>
@@ -370,7 +370,7 @@ admhc_dump_ed(const struct admhcd *ahcd, const char *label,
 #else /* ifdef DEBUG */
 
 static inline void urb_print(struct admhcd *ahcd, struct urb * urb, char * str,
-       int small) {}
+       int small, int status) {}
 static inline void admhc_dump_ed(const struct admhcd *ahcd, const char *label,
        const struct ed *ed, int verbose) {}
 static inline void admhc_dump_td(const struct admhcd *ahcd, const char *label,
@@ -393,7 +393,6 @@ static inline void remove_debug_files(struct admhcd *bus) { }
 static int debug_async_open(struct inode *, struct file *);
 static int debug_periodic_open(struct inode *, struct file *);
 static int debug_registers_open(struct inode *, struct file *);
-static int debug_async_open(struct inode *, struct file *);
 static ssize_t debug_output(struct file*, char __user*, size_t, loff_t*);
 static int debug_close(struct inode *, struct file *);
 
@@ -429,7 +428,8 @@ struct debug_buffer {
 static ssize_t
 show_list(struct admhcd *ahcd, char *buf, size_t count, struct ed *ed)
 {
-       unsigned                temp, size = count;
+       unsigned temp;
+       unsigned size = count;
 
        if (!ed)
                return 0;
@@ -488,6 +488,7 @@ show_list(struct admhcd *ahcd, char *buf, size_t count, struct ed *ed)
 
                ed = ed->ed_next;
        }
+
        return count - size;
 }
 
@@ -503,9 +504,8 @@ static ssize_t fill_async_buffer(struct debug_buffer *buf)
        hcd = bus_to_hcd(bus);
        ahcd = hcd_to_admhcd(hcd);
 
-       /* display control and bulk lists together, for simplicity */
        spin_lock_irqsave(&ahcd->lock, flags);
-       temp = show_list(ahcd, buf->page, buf->count, ahcd->ed_head);
+       temp = show_list(ahcd, buf->page, PAGE_SIZE, ahcd->ed_head);
        spin_unlock_irqrestore(&ahcd->lock, flags);
 
        return temp;
@@ -638,7 +638,7 @@ static ssize_t fill_registers_buffer(struct debug_buffer *buf)
                "%s\n"
                "%s version " DRIVER_VERSION "\n",
                hcd->self.controller->bus->name,
-               hcd->self.controller->bus_id,
+               dev_name(hcd->self.controller),
                hcd->product_desc,
                hcd_name);