[U-Boot] [PATCH] dm: Remove device_probe_child()

[U-Boot] [PATCH] dm: Remove device_probe_child()

[Simon Glass]

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>
---

 drivers/core/device.c        |  9 +--------
 include/dm/device-internal.h | 13 -------------
 2 files changed, 1 insertion(+), 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
-- 
2.7.0.rc3.207.g0ac5344

[U-Boot] [PATCH] dm: Remove device_probe_child()

[Tom Rini]

On Mon, Jan 25, 2016 at 02:58:42PM -0700, Simon Glass wrote:

> 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>

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160125/d88e2b77/attachment.sig>

[U-Boot] [PATCH] dm: Remove device_probe_child()

[Bin Meng]

On Tue, Jan 26, 2016 at 5:58 AM, Simon Glass <sjg@chromium.org> wrote:
> 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>
> ---
>
>  drivers/core/device.c        |  9 +--------
>  include/dm/device-internal.h | 13 -------------
>  2 files changed, 1 insertion(+), 21 deletions(-)
>

Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

[U-Boot] [PATCH] dm: Remove device_probe_child()

[Simon Glass]

On 25 January 2016 at 18:15, Bin Meng <bmeng.cn@gmail.com> wrote:
> On Tue, Jan 26, 2016 at 5:58 AM, Simon Glass <sjg@chromium.org> wrote:
>> 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>
>> ---
>>
>>  drivers/core/device.c        |  9 +--------
>>  include/dm/device-internal.h | 13 -------------
>>  2 files changed, 1 insertion(+), 21 deletions(-)
>>
>
> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

Applied to u-boot-dm.