Use simpler names for these functions.
Signed-off-by: Simon Glass sjg@chromium.org ---
(no changes since v1)
arch/sandbox/cpu/spl.c | 4 ++-- arch/x86/lib/tpl.c | 2 +- cmd/vbe.c | 2 +- common/spl/spl.c | 5 ++--- include/spl.h | 8 ++++---- 5 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/arch/sandbox/cpu/spl.c b/arch/sandbox/cpu/spl.c index 71d785f4c3e..c50df5f9179 100644 --- a/arch/sandbox/cpu/spl.c +++ b/arch/sandbox/cpu/spl.c @@ -27,8 +27,8 @@ int sandbox_find_next_phase(char *fname, int maxlen, bool use_img) const char *cur_prefix, *next_prefix; int ret;
- cur_prefix = spl_phase_prefix(xpl_phase()); - next_prefix = spl_phase_prefix(xpl_next_phase()); + cur_prefix = xpl_prefix(xpl_phase()); + next_prefix = xpl_prefix(xpl_next_phase()); ret = os_find_u_boot(fname, maxlen, use_img, cur_prefix, next_prefix); if (ret) return log_msg_ret("find", ret); diff --git a/arch/x86/lib/tpl.c b/arch/x86/lib/tpl.c index 0606b4a1c67..f7df7e03621 100644 --- a/arch/x86/lib/tpl.c +++ b/arch/x86/lib/tpl.c @@ -103,7 +103,7 @@ int spl_spi_load_image(void)
void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image) { - debug("Jumping to %s at %lx\n", spl_phase_name(xpl_next_phase()), + debug("Jumping to %s at %lx\n", xpl_name(xpl_next_phase()), (ulong)spl_image->entry_point); #ifdef DEBUG print_buffer(spl_image->entry_point, (void *)spl_image->entry_point, 1, diff --git a/cmd/vbe.c b/cmd/vbe.c index 423d9e5f8f0..186f6e6860d 100644 --- a/cmd/vbe.c +++ b/cmd/vbe.c @@ -93,7 +93,7 @@ static int do_vbe_state(struct cmd_tbl *cmdtp, int flag, int argc, printf("Phases:"); for (i = PHASE_NONE; i < PHASE_COUNT; i++) { if (handoff->phases & (1 << i)) - printf(" %s", spl_phase_name(i)); + printf(" %s", xpl_name(i));
} if (!handoff->phases) diff --git a/common/spl/spl.c b/common/spl/spl.c index ad5c309348b..9748a3fb3e9 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -475,8 +475,7 @@ static int spl_common_init(bool setup_malloc) if (ret) log_debug("Failed to unstash bootstage: ret=%d\n", ret); } - bootstage_mark_name(get_bootstage_id(true), - spl_phase_name(xpl_phase())); + bootstage_mark_name(get_bootstage_id(true), xpl_name(xpl_phase())); #if CONFIG_IS_ENABLED(LOG) ret = log_init(); if (ret) { @@ -762,7 +761,7 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
os = spl_image.os; if (os == IH_OS_U_BOOT) { - debug("Jumping to %s...\n", spl_phase_name(xpl_next_phase())); + debug("Jumping to %s...\n", xpl_name(xpl_next_phase())); } else if (CONFIG_IS_ENABLED(ATF) && os == IH_OS_ARM_TRUSTED_FIRMWARE) { debug("Jumping to U-Boot via ARM Trusted Firmware\n"); spl_fixup_fdt(spl_image_fdt_addr(&spl_image)); diff --git a/include/spl.h b/include/spl.h index 50ffe4f79f9..b2978d8bbaf 100644 --- a/include/spl.h +++ b/include/spl.h @@ -194,11 +194,11 @@ static inline enum xpl_phase_t xpl_next_phase(void) }
/** - * spl_phase_name() - Get the name of the current phase + * xpl_name() - Get the name of a phase * * Return: phase name */ -static inline const char *spl_phase_name(enum xpl_phase_t phase) +static inline const char *xpl_name(enum xpl_phase_t phase) { switch (phase) { case PHASE_TPL: @@ -216,12 +216,12 @@ static inline const char *spl_phase_name(enum xpl_phase_t phase) }
/** - * spl_phase_prefix() - Get the prefix of the current phase + * xpl_prefix() - Get the prefix of the current phase * * @phase: Phase to look up * Return: phase prefix ("spl", "tpl", etc.) */ -static inline const char *spl_phase_prefix(enum xpl_phase_t phase) +static inline const char *xpl_prefix(enum xpl_phase_t phase) { switch (phase) { case PHASE_TPL: