USB: usb dev_name() instead of dev->bus_id

[linux-2.6] / drivers / usb / host / ehci-dbg.c

diff --git a/drivers/usb/host/ehci-dbg.c b/drivers/usb/host/ehci-dbg.c
index 38eb92e5dc42b6522d62c4af1eeccfeb8576aa4a..b0f8ed5a7fb9dce367ad6d24feeea7fd5c8315c9 100644 (file)
--- a/drivers/usb/host/ehci-dbg.c
+++ b/drivers/usb/host/ehci-dbg.c
@@ -398,7 +398,7 @@ static void qh_lines (
        unsigned                size = *sizep;
        char                    *next = *nextp;
        char                    mark;
-       u32                     list_end = EHCI_LIST_END(ehci);
+       __le32                  list_end = EHCI_LIST_END(ehci);
 
        if (qh->hw_qtd_next == list_end)        /* NEC does this */
                mark = '@';
@@ -670,13 +670,13 @@ static ssize_t fill_registers_buffer(struct debug_buffer *buf)
 
        spin_lock_irqsave (&ehci->lock, flags);
 
-       if (buf->bus->controller->power.power_state.event) {
+       if (!test_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags)) {
                size = scnprintf (next, size,
                        "bus %s, device %s (driver " DRIVER_VERSION ")\n"
                        "%s\n"
                        "SUSPENDED (no register access)\n",
                        hcd->self.controller->bus->name,
-                       hcd->self.controller->bus_id,
+                       dev_name(hcd->self.controller),
                        hcd->product_desc);
                goto done;
        }
@@ -688,7 +688,7 @@ static ssize_t fill_registers_buffer(struct debug_buffer *buf)
                "%s\n"
                "EHCI %x.%02x, hcd state %d\n",
                hcd->self.controller->bus->name,
-               hcd->self.controller->bus_id,
+               dev_name(hcd->self.controller),
                hcd->product_desc,
                i >> 8, i & 0x0ff, hcd->state);
        size -= temp;