From: Simon Glass <simon.glass@canonical.com> Use a consistent naming convention with the pxe_ prefix. Co-developed-by: Claude Opus 4.5 <noreply@anthropic.com> Signed-off-by: Simon Glass <simon.glass@canonical.com> --- boot/pxe_utils.c | 6 +++--- include/pxe_utils.h | 6 +++--- test/boot/pxe.c | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/boot/pxe_utils.c b/boot/pxe_utils.c index 1516065a467..a824b1b5623 100644 --- a/boot/pxe_utils.c +++ b/boot/pxe_utils.c @@ -900,7 +900,7 @@ static int label_boot(struct pxe_context *ctx, struct pxe_label *label) return 1; } -void destroy_pxe_menu(struct pxe_menu *cfg) +void pxe_menu_uninit(struct pxe_menu *cfg) { struct list_head *pos, *n; struct pxe_label *label; @@ -946,7 +946,7 @@ struct pxe_menu *parse_pxefile(struct pxe_context *ctx, unsigned long menucfg) unmap_sysmem(buf); if (r < 0) { - destroy_pxe_menu(cfg); + pxe_menu_uninit(cfg); return NULL; } @@ -1192,7 +1192,7 @@ int pxe_process(struct pxe_context *ctx, ulong pxefile_addr_r, bool prompt) handle_pxe_menu(ctx, cfg); - destroy_pxe_menu(cfg); + pxe_menu_uninit(cfg); return 0; } diff --git a/include/pxe_utils.h b/include/pxe_utils.h index c0d2167cc25..0de2f49aab5 100644 --- a/include/pxe_utils.h +++ b/include/pxe_utils.h @@ -179,13 +179,13 @@ struct pxe_context { }; /** - * destroy_pxe_menu() - Destroy an allocated pxe structure + * pxe_menu_uninit() - Destroy an allocated pxe structure * * Free the memory used by a pxe_menu and its labels * * @cfg: Config to destroy, previous returned from parse_pxefile() */ -void destroy_pxe_menu(struct pxe_menu *cfg); +void pxe_menu_uninit(struct pxe_menu *cfg); /** * get_pxe_file() - Read a file @@ -243,7 +243,7 @@ void handle_pxe_menu(struct pxe_context *ctx, struct pxe_menu *cfg); * Returns NULL if there is an error, otherwise, returns a pointer to a * pxe_menu struct populated with the results of parsing the pxe file (and any * files it includes). The resulting pxe_menu struct can be free()'d by using - * the destroy_pxe_menu() function. + * the pxe_menu_uninit() function. */ struct pxe_menu *parse_pxefile(struct pxe_context *ctx, ulong menucfg); diff --git a/test/boot/pxe.c b/test/boot/pxe.c index 4ac0d6c6fa6..8d7c6f7f2ae 100644 --- a/test/boot/pxe.c +++ b/test/boot/pxe.c @@ -286,7 +286,7 @@ static int pxe_test_parse_norun(struct unit_test_state *uts) ut_assert_console_end(); /* Clean up */ - destroy_pxe_menu(cfg); + pxe_menu_uninit(cfg); pxe_destroy_ctx(&ctx); return 0; @@ -476,7 +476,7 @@ static int pxe_test_fdtdir_norun(struct unit_test_state *uts) env_set("soc", NULL); env_set("board", NULL); - destroy_pxe_menu(cfg); + pxe_menu_uninit(cfg); pxe_destroy_ctx(&ctx); return 0; @@ -595,7 +595,7 @@ static int pxe_test_errors_norun(struct unit_test_state *uts) /* Clean up */ env_set("fdtfile", NULL); - destroy_pxe_menu(cfg); + pxe_menu_uninit(cfg); pxe_destroy_ctx(&ctx); return 0; @@ -681,7 +681,7 @@ static int pxe_test_overlay_no_addr_norun(struct unit_test_state *uts) ut_assert_console_end(); /* Clean up */ - destroy_pxe_menu(cfg); + pxe_menu_uninit(cfg); pxe_destroy_ctx(&ctx); return 0; @@ -1151,7 +1151,7 @@ static int pxe_test_alloc_norun(struct unit_test_state *uts) ut_asserteq(false, ctx.fake_go); /* Clean up */ - destroy_pxe_menu(ctx.cfg); + pxe_menu_uninit(ctx.cfg); pxe_destroy_ctx(&ctx); ut_assertok(env_set("pxe_timeout", NULL)); ut_assertok(env_set("fdt_addr", orig_fdt_addr)); @@ -1245,7 +1245,7 @@ static int pxe_test_fit_embedded_fdt_norun(struct unit_test_state *uts) ut_asserteq(0, ctx.conf_fdt); /* Clean up */ - destroy_pxe_menu(cfg); + pxe_menu_uninit(cfg); pxe_destroy_ctx(&ctx); return 0; -- 2.43.0