brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-09-27 15:10:26 +09:00
Code Issues Projects Releases Wiki Activity

Revert "dm: Export device_remove_children / device_unbind_children"

Browse Source 
This reverts commit bb52b367f6.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2015-11-08 23:47:58 -07:00
parent ba94e83911
commit 79725ca4f6
2 changed files with 18 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/core/device-remove.c
View File

@ -18,7 +18,16 @@
#include <dm/uclass-internal.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;
int ret, saved_ret = 0;
@ -34,7 +43,12 @@ int device_unbind_children(struct udevice *dev)
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;
int ret;
@ -73,7 +87,7 @@ int device_unbind(struct udevice *dev)
return ret;
}
ret = device_unbind_children(dev);
ret = device_chld_unbind(dev);
if (ret)
return ret;
@ -153,7 +167,7 @@ int device_remove(struct udevice *dev)
if (ret)
return ret;
ret = device_remove_children(dev);
ret = device_chld_remove(dev);
if (ret)
goto err;

26
include/dm/device-internal.h
View File

@ -107,32 +107,6 @@ int device_unbind(struct udevice *dev);
static inline int device_unbind(struct udevice *dev) { return 0; }
#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)
void device_free(struct udevice *dev);
#else