dm: usb: Make usb_get_bus easier to use for callers

Make usb_get_bus easier to use for callers, by directly returning the bus
rather then returning it via a pass-by-ref argument.

This also removes the error checking from the current callers, as
we already have an assert() for bus not being NULL in usb_get_bus().

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Simon Glass <sjg@chromium.org>

diff --git a/drivers/usb/host/usb-uclass.c b/drivers/usb/host/usb-uclass.c
index 8dc18236aba8a21d929d6e4b4a1b213bb03195ab..ba7d32a046a823b0e63c9ddad43295732198970f 100644 (file)
--- a/drivers/usb/host/usb-uclass.c
+++ b/drivers/usb/host/usb-uclass.c
@@ -476,9 +476,7 @@ int usb_scan_device(struct udevice *parent, int port,
 
        *devp = NULL;
        memset(udev, '\0', sizeof(*udev));
-       ret = usb_get_bus(parent, &udev->controller_dev);
-       if (ret)
-               return ret;
+       udev->controller_dev = usb_get_bus(parent);
        priv = dev_get_uclass_priv(udev->controller_dev);
 
        /*
@@ -578,35 +576,28 @@ int usb_child_post_bind(struct udevice *dev)
        return 0;
 }
 
-int usb_get_bus(struct udevice *dev, struct udevice **busp)
+struct udevice *usb_get_bus(struct udevice *dev)
 {
        struct udevice *bus;
 
-       *busp = NULL;
        for (bus = dev; bus && device_get_uclass_id(bus) != UCLASS_USB; )
                bus = bus->parent;
        if (!bus) {
                /* By design this cannot happen */
                assert(bus);
                debug("USB HUB '%s' does not have a controller\n", dev->name);
-               return -EXDEV;
        }
-       *busp = bus;
 
-       return 0;
+       return bus;
 }
 
 int usb_child_pre_probe(struct udevice *dev)
 {
-       struct udevice *bus;
        struct usb_device *udev = dev_get_parentdata(dev);
        struct usb_dev_platdata *plat = dev_get_parent_platdata(dev);
        int ret;
 
-       ret = usb_get_bus(dev, &bus);
-       if (ret)
-               return ret;
-       udev->controller_dev = bus;
+       udev->controller_dev = usb_get_bus(dev);
        udev->dev = dev;
        udev->devnum = plat->devnum;
        udev->slot_id = plat->slot_id;

diff --git a/include/usb.h b/include/usb.h
index 1984e8f590c72743df72e86f7f99c6214d3b3f1f..6207d369959bcc1c8097617465542b2134cda24b 100644 (file)
--- a/include/usb.h
+++ b/include/usb.h
@@ -742,11 +742,10 @@ int usb_scan_device(struct udevice *parent, int port,
  * will be a device with uclass UCLASS_USB.
  *
  * @dev:       Device to check
- * @busp:      Returns bus, or NULL if not found
- * @return 0 if OK, -EXDEV is somehow this bus does not have a controller (this
- *     indicates a critical error in the USB stack
+ * @return The bus, or NULL if not found (this indicates a critical error in
+ *     the USB stack
  */
-int usb_get_bus(struct udevice *dev, struct udevice **busp);
+struct udevice *usb_get_bus(struct udevice *dev);
 
 /**
  * usb_select_config() - Set up a device ready for use