summaryrefslogtreecommitdiff
path: root/drivers/core
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-01-29 13:47:38 -0500
committerTom Rini <trini@konsulko.com>2016-01-29 13:47:38 -0500
commit8a36287a019f5d7532a8a1a7da6aa96e490dbb8a (patch)
treecae7e68596b7405120720f7a81c7ffb04d6ffa6e /drivers/core
parent82d72a1b9967cff4908f22c57536c3660f794401 (diff)
parent26db3a617b38cc1bed1ce100381d2c4ccbb55e42 (diff)
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'drivers/core')
-rw-r--r--drivers/core/device.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/core/device.c b/drivers/core/device.c
index f5def35b5b..cb24a617ce 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) {