mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2025-08-07 07:46:59 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

expo: Drop scene_title_set()

Browse Source 
This function is really just an assignment, so serves no useful
purpose. Drop it.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2024-10-14 16:32:02 -06:00
parent fde707501f
commit 96cbafb1d2
4 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
boot/expo_build.c
View File

@ -404,7 +404,7 @@ static int scene_build(struct build_info *info, ofnode scn_node,
if (ret < 0) if (ret < 0)
return log_msg_ret("tit", ret); return log_msg_ret("tit", ret);
title_id = ret; title_id = ret;
scene_title_set(scn, title_id); scn->title_id = title_id;
ret = add_txt_str(info, scn_node, scn, "prompt", 0); ret = add_txt_str(info, scn_node, scn, "prompt", 0);
if (ret < 0) if (ret < 0)
@ -420,7 +420,7 @@ static int scene_build(struct build_info *info, ofnode scn_node,
return 0; return 0;
} }
int build_it(struct build_info *info, ofnode root, struct expo **expp) static int build_it(struct build_info *info, ofnode root, struct expo **expp)
{ {
ofnode scenes, node; ofnode scenes, node;
struct expo *exp; struct expo *exp;

7
boot/scene.c
View File

@ -70,13 +70,6 @@ void scene_destroy(struct scene *scn)
free(scn); free(scn);
} }
int scene_title_set(struct scene *scn, uint id)
{
scn->title_id = id;
return 0;
}
int scene_obj_count(struct scene *scn) int scene_obj_count(struct scene *scn)
{ {
return list_count_nodes(&scn->obj_head); return list_count_nodes(&scn->obj_head);

9
include/expo.h
View File

@ -540,15 +540,6 @@ void scene_set_highlight_id(struct scene *scn, uint id);
*/ */
int scene_set_open(struct scene *scn, uint id, bool open); int scene_set_open(struct scene *scn, uint id, bool open);
/**
* scene_title_set() - set the scene title
*
* @scn: Scene to update
* @title_id: Title ID to set
* Returns: 0 if OK
*/
int scene_title_set(struct scene *scn, uint title_id);
/** /**
* scene_obj_count() - Count the number of objects in a scene * scene_obj_count() - Count the number of objects in a scene
* *

2
test/boot/expo.c
View File

@ -151,7 +151,7 @@ static int expo_scene(struct unit_test_state *uts)
scn = NULL; scn = NULL;
id = scene_new(exp, SCENE_NAME2, 0, &scn); id = scene_new(exp, SCENE_NAME2, 0, &scn);
ut_assertnonnull(scn); ut_assertnonnull(scn);
ut_assertok(scene_title_set(scn, title_id)); scn->title_id = title_id;
ut_asserteq(STR_SCENE_TITLE + 1, id); ut_asserteq(STR_SCENE_TITLE + 1, id);
ut_asserteq(STR_SCENE_TITLE + 2, exp->next_id); ut_asserteq(STR_SCENE_TITLE + 2, exp->next_id);
ut_asserteq_ptr(exp, scn->expo); ut_asserteq_ptr(exp, scn->expo);