Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-19 03:15:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

device: expose the functions used to remove and unbind children of a device

Browse source 
Also add a 'drv' parameter to filter the children to remove/unbind.
Exporting those functions is a preparatory work for the addition of the
bind/unbind commands.

Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
This commit is contained in:
Jean-Jacques Hiblot 2018-08-09 16:17:45 +02:00 • committed by Marek Vasut
parent 7ec9181d6a
commit 3be9bcb048
2 changed files with 49 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
drivers/core/device-remove.c
View file

@ -17,16 +17,7 @@
#include <dm/uclass-internal.h> #include <dm/uclass-internal.h>
#include <dm/util.h> #include <dm/util.h>
/** int device_chld_unbind(struct udevice *dev, struct driver *drv)
* 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,6 +25,9 @@ static int device_chld_unbind(struct udevice *dev)
assert(dev); assert(dev);
list_for_each_entry_safe(pos, n, &dev->child_head, sibling_node) { list_for_each_entry_safe(pos, n, &dev->child_head, sibling_node) {
if (drv && (pos->driver != drv))
continue;
ret = device_unbind(pos); ret = device_unbind(pos);
if (ret && !saved_ret) if (ret && !saved_ret)
saved_ret = ret; saved_ret = ret;
@ -42,13 +36,8 @@ static int device_chld_unbind(struct udevice *dev)
return saved_ret; return saved_ret;
} }
/** int device_chld_remove(struct udevice *dev, struct driver *drv,
* device_chld_remove() - Stop all device's children uint flags)
* @dev: The device whose children are to be removed
* @pre_os_remove: Flag, if this functions is called in the pre-OS stage
* @return 0 on success, -ve on error
*/
static int device_chld_remove(struct udevice *dev, uint flags)
{ {
struct udevice *pos, *n; struct udevice *pos, *n;
int ret; int ret;
@ -56,6 +45,9 @@ static int device_chld_remove(struct udevice *dev, uint flags)
assert(dev); assert(dev);
list_for_each_entry_safe(pos, n, &dev->child_head, sibling_node) { list_for_each_entry_safe(pos, n, &dev->child_head, sibling_node) {
if (drv && (pos->driver != drv))
continue;
ret = device_remove(pos, flags); ret = device_remove(pos, flags);
if (ret) if (ret)
return ret; return ret;
@ -87,7 +79,7 @@ int device_unbind(struct udevice *dev)
return ret; return ret;
} }
ret = device_chld_unbind(dev); ret = device_chld_unbind(dev, NULL);
if (ret) if (ret)
return ret; return ret;
@ -178,7 +170,7 @@ int device_remove(struct udevice *dev, uint flags)
if (ret) if (ret)
return ret; return ret;
ret = device_chld_remove(dev, flags); ret = device_chld_remove(dev, NULL, flags);
if (ret) if (ret)
goto err; goto err;

38
include/dm/device-internal.h
View file

@ -130,6 +130,44 @@ void device_free(struct udevice *dev);
static inline void device_free(struct udevice *dev) {} static inline void device_free(struct udevice *dev) {}
#endif #endif
/**
* device_chld_unbind() - Unbind all device's children from the device if bound
* to drv
*
* 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
* @drv: The targeted driver
* @return 0 on success, -ve on error
*/
#if CONFIG_IS_ENABLED(DM_DEVICE_REMOVE)
int device_chld_unbind(struct udevice *dev, struct driver *drv);
#else
static inline int device_chld_unbind(struct udevice *dev, struct driver *drv)
{
return 0;
}
#endif
/**
* device_chld_remove() - Stop all device's children
* @dev: The device whose children are to be removed
* @drv: The targeted driver
* @flags: Flag, if this functions is called in the pre-OS stage
* @return 0 on success, -ve on error
*/
#if CONFIG_IS_ENABLED(DM_DEVICE_REMOVE)
int device_chld_remove(struct udevice *dev, struct driver *drv,
uint flags);
#else
static inline int device_chld_remove(struct udevice *dev, struct driver *drv,
uint flags)
{
return 0;
}
#endif
/** /**
* simple_bus_translate() - translate a bus address to a system address * simple_bus_translate() - translate a bus address to a system address
* *