Commit 79725ca4 authored by Simon Glass's avatar Simon Glass
Browse files

Revert "dm: Export device_remove_children / device_unbind_children"

This reverts commit bb52b367

.
Signed-off-by: Simon Glass's avatarSimon Glass <sjg@chromium.org>
parent ba94e839
...@@ -18,7 +18,16 @@ ...@@ -18,7 +18,16 @@
#include <dm/uclass-internal.h> #include <dm/uclass-internal.h>
#include <dm/util.h> #include <dm/util.h>
int device_unbind_children(struct udevice *dev) /**
* device_chld_unbind() - Unbind all device's children from the device
*
* On error, the function continues to unbind all children, and reports the
* first error.
*
* @dev: The device that is to be stripped of its children
* @return 0 on success, -ve on error
*/
static int device_chld_unbind(struct udevice *dev)
{ {
struct udevice *pos, *n; struct udevice *pos, *n;
int ret, saved_ret = 0; int ret, saved_ret = 0;
...@@ -34,7 +43,12 @@ int device_unbind_children(struct udevice *dev) ...@@ -34,7 +43,12 @@ int device_unbind_children(struct udevice *dev)
return saved_ret; return saved_ret;
} }
int device_remove_children(struct udevice *dev) /**
* device_chld_remove() - Stop all device's children
* @dev: The device whose children are to be removed
* @return 0 on success, -ve on error
*/
static int device_chld_remove(struct udevice *dev)
{ {
struct udevice *pos, *n; struct udevice *pos, *n;
int ret; int ret;
...@@ -73,7 +87,7 @@ int device_unbind(struct udevice *dev) ...@@ -73,7 +87,7 @@ int device_unbind(struct udevice *dev)
return ret; return ret;
} }
ret = device_unbind_children(dev); ret = device_chld_unbind(dev);
if (ret) if (ret)
return ret; return ret;
...@@ -153,7 +167,7 @@ int device_remove(struct udevice *dev) ...@@ -153,7 +167,7 @@ int device_remove(struct udevice *dev)
if (ret) if (ret)
return ret; return ret;
ret = device_remove_children(dev); ret = device_chld_remove(dev);
if (ret) if (ret)
goto err; goto err;
......
...@@ -107,32 +107,6 @@ int device_unbind(struct udevice *dev); ...@@ -107,32 +107,6 @@ int device_unbind(struct udevice *dev);
static inline int device_unbind(struct udevice *dev) { return 0; } static inline int device_unbind(struct udevice *dev) { return 0; }
#endif #endif
/**
* device_remove_children() - Stop all device's children
* @dev: The device whose children are to be removed
* @return 0 on success, -ve on error
*/
#if CONFIG_IS_ENABLED(DM_DEVICE_REMOVE)
int device_remove_children(struct udevice *dev);
#else
static inline int device_remove_children(struct udevice *dev) { return 0; }
#endif
/**
* device_unbind_children() - Unbind all device's children from the device
*
* On error, the function continues to unbind all children, and reports the
* first error.
*
* @dev: The device that is to be stripped of its children
* @return 0 on success, -ve on error
*/
#if CONFIG_IS_ENABLED(DM_DEVICE_REMOVE)
int device_unbind_children(struct udevice *dev);
#else
static inline int device_unbind_children(struct udevice *dev) { return 0; }
#endif
#if CONFIG_IS_ENABLED(DM_DEVICE_REMOVE) #if CONFIG_IS_ENABLED(DM_DEVICE_REMOVE)
void device_free(struct udevice *dev); void device_free(struct udevice *dev);
#else #else
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment