leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dm: core: Drop unused parameter from dm_extended_scan_fdt()

Browse Source 
This doesn't need to be passed the devicetree anymore. Drop it.
Also rename the function to drop the _fdt suffix.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2020-11-28 17:50:10 -07:00
parent 725e4fce61
commit 8ee05b5f90
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/core/root.c
View File

@ -262,7 +262,7 @@ static int dm_scan_fdt_ofnode_path(const char *path, bool pre_reloc_only)
return dm_scan_fdt_node(gd->dm_root, node, pre_reloc_only);
}
int dm_extended_scan_fdt(const void *blob, bool pre_reloc_only)
int dm_extended_scan(bool pre_reloc_only)
{
int ret, i;
const char * const nodes[] = {
@ -315,9 +315,9 @@ int dm_init_and_scan(bool pre_reloc_only)
}
if (CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)) {
ret = dm_extended_scan_fdt(gd->fdt_blob, pre_reloc_only);
ret = dm_extended_scan(pre_reloc_only);
if (ret) {
debug("dm_extended_scan_dt() failed: %d\n", ret);
debug("dm_extended_scan() failed: %d\n", ret);
return ret;
}
}

5
include/dm/root.h
View File

@ -54,18 +54,17 @@ int dm_scan_platdata(bool pre_reloc_only);
int dm_scan_fdt(bool pre_reloc_only);
/**
* dm_extended_scan_fdt() - Scan the device tree and bind drivers
* dm_extended_scan() - Scan the device tree and bind drivers
*
* This calls dm_scna_dft() which scans the device tree and creates a driver
* for each node. the top-level subnodes are examined and also all sub-nodes
* of "clocks" node.
*
* @blob: Pointer to device tree blob
* @pre_reloc_only: If true, bind only nodes with special devicetree properties,
* or drivers with the DM_FLAG_PRE_RELOC flag. If false bind all drivers.
* @return 0 if OK, -ve on error
*/
int dm_extended_scan_fdt(const void *blob, bool pre_reloc_only);
int dm_extended_scan(bool pre_reloc_only);
/**
* dm_scan_other() - Scan for other devices

2
test/dm/test-fdt.c
View File

@ -257,7 +257,7 @@ static int dm_test_fdt(struct unit_test_state *uts)
int ret;
int i;
ret = dm_extended_scan_fdt(gd->fdt_blob, false);
ret = dm_extended_scan(false);
ut_assert(!ret);
ret = uclass_get(UCLASS_TEST_FDT, &uc);

2
test/dm/test-main.c
View File

@ -94,7 +94,7 @@ static int dm_do_test(struct unit_test_state *uts, struct unit_test *test,
ut_assertok(do_autoprobe(uts));
if (!CONFIG_IS_ENABLED(OF_PLATDATA) &&
(test->flags & UT_TESTF_SCAN_FDT))
ut_assertok(dm_extended_scan_fdt(gd->fdt_blob, false));
ut_assertok(dm_extended_scan(false));
/*
* Silence the console and rely on console recording to get