diff options
| author | Simon Glass <sjg@chromium.org> | 2015-11-09 06:47:58 (GMT) |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2015-11-20 03:27:51 (GMT) |
| commit | 79725ca4f6d583e4c677f694b89c839ed7b07b8f (patch) | |
| tree | 576fd3db9205422aa9c01b4514371d5426a6ef2a | |
| parent | ba94e839119d15a3285a0c33ae24f401e997772d (diff) | |
| download | u-boot-79725ca4f6d583e4c677f694b89c839ed7b07b8f.tar.xz | |
Revert "dm: Export device_remove_children / device_unbind_children"
This reverts commit bb52b367f6ca4a3a918e77737f4ff6a1089912d9.
Signed-off-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | drivers/core/device-remove.c | 22 | ||||
| -rw-r--r-- | include/dm/device-internal.h | 26 |
2 files changed, 18 insertions, 30 deletions
diff --git a/drivers/core/device-remove.c b/drivers/core/device-remove.c index bd6d406..e1714b2 100644 --- a/drivers/core/device-remove.c +++ b/drivers/core/device-remove.c @@ -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; diff --git a/include/dm/device-internal.h b/include/dm/device-internal.h index 322d35a..9388870 100644 --- a/include/dm/device-internal.h +++ b/include/dm/device-internal.h @@ -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 |