dm: core: allow device_bind() to not return a device pointer

This is useful when we want to bind a device, but do not need the
pointer to the device.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Simon Glass <sjg@chromium.org>

diff --git a/drivers/core/device.c b/drivers/core/device.c
index 01f664796d82e5df72ff993d0de78204e6e6eded..afa4b4fda97809e72f0e671fa6f9307a3a92e88d 100644 (file)
--- a/drivers/core/device.c
+++ b/drivers/core/device.c
@@ -32,7 +32,8 @@ int device_bind(struct udevice *parent, const struct driver *drv,
        struct uclass *uc;
        int size, ret = 0;
 
        struct uclass *uc;
        int size, ret = 0;
 

-       *devp = NULL;
+       if (devp)
+               *devp = NULL;

        if (!name)
                return -EINVAL;
 
        if (!name)
                return -EINVAL;
 


@@ -133,7 +134,8 @@ int device_bind(struct udevice *parent, const struct driver *drv,
 
        if (parent)
                dm_dbg("Bound device %s to %s\n", dev->name, parent->name);
 
        if (parent)
                dm_dbg("Bound device %s to %s\n", dev->name, parent->name);

-       *devp = dev;
+       if (devp)
+               *devp = dev;

 
        dev->flags |= DM_FLAG_BOUND;
 
 
        dev->flags |= DM_FLAG_BOUND;
 

diff --git a/include/dm/device-internal.h b/include/dm/device-internal.h
index 04884f18057e3a3ca2da81f4e2094433dbf6b4c1..322d35a4789c2f81a1401d066af09f3a47b22983 100644 (file)
--- a/include/dm/device-internal.h
+++ b/include/dm/device-internal.h
@@ -31,7 +31,7 @@ struct udevice;
  * devices which use device tree.
  * @of_offset: Offset of device tree node for this device. This is -1 for
  * devices which don't use device tree.
  * devices which use device tree.
  * @of_offset: Offset of device tree node for this device. This is -1 for
  * devices which don't use device tree.

- * @devp: Returns a pointer to the bound device
+ * @devp: if non-NULL, returns a pointer to the bound device

  * @return 0 if OK, -ve on error
  */
 int device_bind(struct udevice *parent, const struct driver *drv,
  * @return 0 if OK, -ve on error
  */
 int device_bind(struct udevice *parent, const struct driver *drv,


@@ -48,7 +48,7 @@ int device_bind(struct udevice *parent, const struct driver *drv,
  * @pre_reloc_only: If true, bind the driver only if its DM_INIT_F flag is set.
  * If false bind the driver always.
  * @info: Name and platdata for this device
  * @pre_reloc_only: If true, bind the driver only if its DM_INIT_F flag is set.
  * If false bind the driver always.
  * @info: Name and platdata for this device

- * @devp: Returns a pointer to the bound device
+ * @devp: if non-NULL, returns a pointer to the bound device

  * @return 0 if OK, -ve on error
  */
 int device_bind_by_name(struct udevice *parent, bool pre_reloc_only,
  * @return 0 if OK, -ve on error
  */
 int device_bind_by_name(struct udevice *parent, bool pre_reloc_only,

diff --git a/include/dm/lists.h b/include/dm/lists.h
index 61610e69aa551532927f7875227c31f3c980784a..4513d6a311a7e80daebd6bb1bd32a0e2e92701d3 100644 (file)
--- a/include/dm/lists.h
+++ b/include/dm/lists.h
@@ -68,7 +68,7 @@ int lists_bind_fdt(struct udevice *parent, const void *blob, int offset,
  * @parent:    Parent device
  * @drv_name:  Name of driver to attach to this parent
  * @dev_name:  Name of the new device thus created
  * @parent:    Parent device
  * @drv_name:  Name of driver to attach to this parent
  * @dev_name:  Name of the new device thus created

- * @devp:      Returns the newly bound device
+ * @devp:      If non-NULL, returns the newly bound device

  */
 int device_bind_driver(struct udevice *parent, const char *drv_name,
                       const char *dev_name, struct udevice **devp);
  */
 int device_bind_driver(struct udevice *parent, const char *drv_name,
                       const char *dev_name, struct udevice **devp);


@@ -83,7 +83,7 @@ int device_bind_driver(struct udevice *parent, const char *drv_name,
  * @drv_name:  Name of driver to attach to this parent
  * @dev_name:  Name of the new device thus created
  * @node:      Device tree node
  * @drv_name:  Name of driver to attach to this parent
  * @dev_name:  Name of the new device thus created
  * @node:      Device tree node

- * @devp:      Returns the newly bound device
+ * @devp:      If non-NULL, returns the newly bound device

  */
 int device_bind_driver_to_node(struct udevice *parent, const char *drv_name,
                               const char *dev_name, int node,
  */
 int device_bind_driver_to_node(struct udevice *parent, const char *drv_name,
                               const char *dev_name, int node,