usb: host: Print device name when scanning

Drop the counter, it has no meaning other than being the order in which
the interface is found; the name assigned to the USB host controller
interface is a better indicator.

Example of the original output:
> USB0:   USB EHCI 1.10
> scanning bus 0 for devices... 2 USB Device(s) found
>        scanning usb for storage devices... 1 Storage Device(s) found

Patched output:
> Bus usb@ee080100: USB EHCI 1.10
> scanning bus usb@ee080100 for devices... 2 USB Device(s) found
>        scanning usb for storage devices... 1 Storage Device(s) found

Signed-off-by: Ismael Luceno <ismael.luceno@silicon-gears.com>

diff --git a/drivers/usb/host/usb-uclass.c b/drivers/usb/host/usb-uclass.c
index 611ea97a724929903d3ba028b53a42f894c223be..6e118b5a8ffa408fd8b9c7f5595e0ae47b200b58 100644 (file)
--- a/drivers/usb/host/usb-uclass.c
+++ b/drivers/usb/host/usb-uclass.c
@@ -210,7 +210,7 @@ static void usb_scan_bus(struct udevice *bus, bool recurse)
 
        assert(recurse);        /* TODO: Support non-recusive */
 
-       printf("scanning bus %d for devices... ", bus->seq);
+       printf("scanning bus %s for devices... ", bus->name);
        debug("\n");
        ret = usb_scan_device(bus, 0, USB_SPEED_FULL, &dev);
        if (ret)
@@ -242,7 +242,6 @@ int usb_init(void)
        struct usb_bus_priv *priv;
        struct udevice *bus;
        struct uclass *uc;
-       int count = 0;
        int ret;
 
        asynch_allowed = 1;
@@ -255,8 +254,7 @@ int usb_init(void)
 
        uclass_foreach_dev(bus, uc) {
                /* init low_level USB */
-               printf("USB%d:   ", count);
-               count++;
+               printf("Bus %s: ", bus->name);
 
 #ifdef CONFIG_SANDBOX
                /*
@@ -327,10 +325,8 @@ int usb_init(void)
        remove_inactive_children(uc, bus);
 
        /* if we were not able to find at least one working bus, bail out */
-       if (!count)
-               printf("No controllers found\n");
-       else if (controllers_initialized == 0)
-               printf("USB error: all controllers failed lowlevel init\n");
+       if (controllers_initialized == 0)
+               printf("No working controllers found\n");
 
        return usb_started ? 0 : -1;
 }