diff options
| author | Tom Rini <trini@konsulko.com> | 2022-10-18 07:36:52 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-10-18 07:36:52 -0400 |
| commit | 700b4fe782f9fc46b7be1b1a93a49356baeccc3f (patch) | |
| tree | 7c4f01a95ceb7288ac9f95ffb59c2ea11b0a33cf /test/dm/core.c | |
| parent | d3031d442b941f059eb83bb67ca10a28a0539f9a (diff) | |
| parent | ae0bf2214b81b56a5670819958234947443680be (diff) | |
Merge tag 'dm-pull-18oct22' of https://source.denx.de/u-boot/custodians/u-boot-dm
Update uclass iterators to work better when devices fail to probe
Support VBE OS requests / fixups
Minor error-handling tweaks to bootm command
Diffstat (limited to 'test/dm/core.c')
| -rw-r--r-- | test/dm/core.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/test/dm/core.c b/test/dm/core.c index fd4d7569728..84eb76ed5fc 100644 --- a/test/dm/core.c +++ b/test/dm/core.c @@ -512,23 +512,15 @@ static int dm_test_leak(struct unit_test_state *uts) int i; for (i = 0; i < 2; i++) { - struct udevice *dev; int ret; - int id; dm_leak_check_start(uts); ut_assertok(dm_scan_plat(false)); ut_assertok(dm_scan_fdt(false)); - /* Scanning the uclass is enough to probe all the devices */ - for (id = UCLASS_ROOT; id < UCLASS_COUNT; id++) { - for (ret = uclass_first_device(UCLASS_TEST, &dev); - dev; - ret = uclass_next_device(&dev)) - ; - ut_assertok(ret); - } + ret = uclass_probe_all(UCLASS_TEST); + ut_assertok(ret); ut_assertok(dm_leak_check_end(uts)); } @@ -653,10 +645,7 @@ static int dm_test_children(struct unit_test_state *uts) ut_asserteq(2 + NODE_COUNT, dm_testdrv_op_count[DM_TEST_OP_PROBE]); /* Probe everything */ - for (ret = uclass_first_device(UCLASS_TEST, &dev); - dev; - ret = uclass_next_device(&dev)) - ; + ret = uclass_probe_all(UCLASS_TEST); ut_assertok(ret); ut_asserteq(total, dm_testdrv_op_count[DM_TEST_OP_PROBE]); |