leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dm: usb: Move printing of usb scan status to usb_scan_bus()

Browse Source 
Move printing of usb scan status to usb_scan_bus().

This is a preparation patch for adding companion controller support to the
usb uclass.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Hans de Goede 2015-05-10 14:10:19 +02:00 committed by Simon Glass
parent 8a5f0665da
commit a24a0e9159
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/usb/host/usb-uclass.c
View File

@ -147,7 +147,7 @@ int usb_stop(void)
return err; return err;
} }
static int usb_scan_bus(struct udevice *bus, bool recurse) static void usb_scan_bus(struct udevice *bus, bool recurse)
{ {
struct usb_bus_priv *priv; struct usb_bus_priv *priv;
struct udevice *dev; struct udevice *dev;
@ -157,11 +157,15 @@ static int usb_scan_bus(struct udevice *bus, bool recurse)
assert(recurse); /* TODO: Support non-recusive */ assert(recurse); /* TODO: Support non-recusive */
printf("scanning bus %d for devices... ", bus->seq);
debug("\n");
ret = usb_scan_device(bus, 0, USB_SPEED_FULL, &dev); ret = usb_scan_device(bus, 0, USB_SPEED_FULL, &dev);
if (ret) if (ret)
return ret; printf("failed, error %d\n", ret);
else if (priv->next_addr == 0)
return priv->next_addr; printf("No USB Device found\n");
else
printf("%d USB Device(s) found\n", priv->next_addr);
} }
int usb_init(void) int usb_init(void)
@ -199,15 +203,7 @@ int usb_init(void)
* i.e. search HUBs and configure them * i.e. search HUBs and configure them
*/ */
controllers_initialized++; controllers_initialized++;
printf("scanning bus %d for devices... ", bus->seq); usb_scan_bus(bus, true);
debug("\n");
ret = usb_scan_bus(bus, true);
if (ret < 0)
printf("failed, error %d\n", ret);
else if (!ret)
printf("No USB Device found\n");
else
printf("%d USB Device(s) found\n", ret);
usb_started = true; usb_started = true;
} }