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

dm: core: Convert #ifdef to if() in root.c

Browse Source 
Convert a few conditions to use compile-time checks to reduce the number
of build paths.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2020-10-03 11:31:37 -06:00
parent fbe27a54eb
commit 9e948b9b99
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/core/root.c
View File

@ -50,7 +50,6 @@ void dm_fixup_for_gd_move(struct global_data *new_gd)
}
}
#if defined(CONFIG_NEEDS_MANUAL_RELOC)
void fix_drivers(void)
{
struct driver *drv =
@ -129,8 +128,6 @@ void fix_devices(void)
}
}
#endif
int dm_init(bool of_live)
{
int ret;
@ -141,11 +138,11 @@ int dm_init(bool of_live)
}
INIT_LIST_HEAD(&DM_UCLASS_ROOT_NON_CONST);
#if defined(CONFIG_NEEDS_MANUAL_RELOC)
fix_drivers();
fix_uclass();
fix_devices();
#endif
if (IS_ENABLED(CONFIG_NEEDS_MANUAL_RELOC)) {
fix_drivers();
fix_uclass();
fix_devices();
}
ret = device_bind_by_name(NULL, false, &root_info, &DM_ROOT_NON_CONST);
if (ret)
@ -350,9 +347,8 @@ int dm_init_and_scan(bool pre_reloc_only)
{
int ret;
#if CONFIG_IS_ENABLED(OF_PLATDATA)
dm_populate_phandle_data();
#endif
if (CONFIG_IS_ENABLED(OF_PLATDATA))
dm_populate_phandle_data();
ret = dm_init(CONFIG_IS_ENABLED(OF_LIVE));
if (ret) {