diff options
| author | Simon Glass <sjg@chromium.org> | 2016-01-25 14:58:42 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2016-01-28 21:01:23 -0700 |
| commit | c6db965f67c01c9ac6570eed690103f3ea30b3c4 (patch) | |
| tree | 96f908d0db50a1122342f2407bc207901fdd66df | |
| parent | e5bb279f826fb6967a554f6aaf6c8bf86b23cde2 (diff) | |
| download | u-boot-imx-c6db965f67c01c9ac6570eed690103f3ea30b3c4.zip u-boot-imx-c6db965f67c01c9ac6570eed690103f3ea30b3c4.tar.gz u-boot-imx-c6db965f67c01c9ac6570eed690103f3ea30b3c4.tar.bz2 | |
dm: Remove device_probe_child()
This function is not used as the use case for it did not eventuate. Remove
it to avoid confusion.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
| -rw-r--r-- | drivers/core/device.c | 9 | ||||
| -rw-r--r-- | include/dm/device-internal.h | 13 |
2 files changed, 1 insertions, 21 deletions
diff --git a/drivers/core/device.c b/drivers/core/device.c index f5def35..cb24a61 100644 --- a/drivers/core/device.c +++ b/drivers/core/device.c @@ -223,7 +223,7 @@ static void *alloc_priv(int size, uint flags) return priv; } -int device_probe_child(struct udevice *dev, void *parent_priv) +int device_probe(struct udevice *dev) { const struct driver *drv; int size = 0; @@ -270,8 +270,6 @@ int device_probe_child(struct udevice *dev, void *parent_priv) ret = -ENOMEM; goto fail; } - if (parent_priv) - memcpy(dev->parent_priv, parent_priv, size); } ret = device_probe(dev->parent); @@ -349,11 +347,6 @@ fail: return ret; } -int device_probe(struct udevice *dev) -{ - return device_probe_child(dev, NULL); -} - void *dev_get_platdata(struct udevice *dev) { if (!dev) { diff --git a/include/dm/device-internal.h b/include/dm/device-internal.h index 9388870..b348ad5 100644 --- a/include/dm/device-internal.h +++ b/include/dm/device-internal.h @@ -66,19 +66,6 @@ int device_bind_by_name(struct udevice *parent, bool pre_reloc_only, int device_probe(struct udevice *dev); /** - * device_probe() - Probe a child device, activating it - * - * Activate a device so that it is ready for use. All its parents are probed - * first. The child is provided with parent data if parent_priv is not NULL. - * - * @dev: Pointer to device to probe - * @parent_priv: Pointer to parent data. If non-NULL then this is provided to - * the child. - * @return 0 if OK, -ve on error - */ -int device_probe_child(struct udevice *dev, void *parent_priv); - -/** * device_remove() - Remove a device, de-activating it * * De-activate a device so that it is no longer ready for use. All its |