mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2026-05-05 04:36:13 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

dm: Move flags_remove() check before child removal

Browse Source 
Move the flags_remove() call before device_chld_remove() and save the
result in a separate variable. This is just a refactoring with no
behaviour change, preparing for the next commit which needs to know
whether the parent will be removed before deciding how to remove its
children.

Signed-off-by: Simon Glass <simon.glass@canonical.com>
This commit is contained in:
Simon Glass 2026-03-05 19:36:10 -07:00 committed by Tom Rini
parent c0ca147ac6
commit 714dd2252d
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -198,7 +198,7 @@ static int flags_remove(uint flags, uint drv_flags)
int device_remove(struct udevice *dev, uint flags)
{
const struct driver *drv;
int ret;
int ret, cret;
if (!dev)
return -EINVAL;
@ -210,6 +210,14 @@ int device_remove(struct udevice *dev, uint flags)
if (ret)
return ret;
/*
* Remove the device if called with the "normal" remove flag set,
* or if the remove flag matches any of the drivers remove flags
*/
drv = dev->driver;
assert(drv);
cret = flags_remove(flags, drv->flags);
/*
* If the child returns EKEYREJECTED, continue. It just means that it
* didn't match the flags.
@ -218,17 +226,10 @@ int device_remove(struct udevice *dev, uint flags)
if (ret && ret != -EKEYREJECTED)
return ret;
/*
* Remove the device if called with the "normal" remove flag set,
* or if the remove flag matches any of the drivers remove flags
*/
drv = dev->driver;
assert(drv);
ret = flags_remove(flags, drv->flags);
if (ret) {
if (cret) {
log_debug("%s: When removing: flags=%x, drv->flags=%x, err=%d\n",
dev->name, flags, drv->flags, ret);
return ret;
dev->name, flags, drv->flags, cret);
return cret;
}
ret = uclass_pre_remove_device(dev);