michael/u-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

boot: Move preparing bootdev into a function

Browse Source 
We will want to use this same logic in another place within iter_inc(),
so split it out into its own function.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Simon Glass
2025-10-12 00:43:56 -06:00
committed by Tom Rini
parent f6cd0a36ce
commit 996ded5463
1 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
boot/bootflow.c
View File

@@ -177,6 +177,32 @@ static void scan_next_in_uclass(struct udevice **devp)
*devp = dev;
}
/**
* prepare_bootdev() - Get ready to use a bootdev
*
* @iter: Bootflow iterator being used
* @dev: UCLASS_BOOTDEV device to use
* @method_flags: Method flag for the bootdev
* Return 0 if OK, -ve if the bootdev failed to probe
*/
static int prepare_bootdev(struct bootflow_iter *iter, struct udevice *dev,
int method_flags)
{
int ret;
/*
* Probe the bootdev. This does not probe any attached block device,
* since they are siblings
*/
ret = device_probe(dev);
log_debug("probe %s %d\n", dev->name, ret);
if (ret)
return log_msg_ret("probe", ret);
bootflow_iter_set_dev(iter, dev, method_flags);
return 0;
}
/**
* iter_incr() - Move to the next item (method, part, bootdev)
*
@@ -310,18 +336,10 @@ static int iter_incr(struct bootflow_iter *iter)
}
log_debug("ret=%d, dev=%p %s\n", ret, dev,
dev ? dev->name : "none");
if (ret) {
if (ret)
bootflow_iter_set_dev(iter, NULL, 0);
} else {
/*
* Probe the bootdev. This does not probe any attached
* block device, since they are siblings
*/
ret = device_probe(dev);
log_debug("probe %s %d\n", dev->name, ret);
if (!log_msg_ret("probe", ret))
bootflow_iter_set_dev(iter, dev, method_flags);
}
else
ret = prepare_bootdev(iter, dev, method_flags);
}
/* if there are no more bootdevs, give up */