summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2024-10-14 16:32:02 -0600
committerSimon Glass <sjg@chromium.org>2024-10-18 14:10:22 -0600
commit96cbafb1d2902cfbf8a7776f258e97b4394d00fe (patch)
tree86b8382032e3bde7a96b27ec1d6f4052e89c0541
parentfde707501f614ad57dbbbc6269f1b99b86875c39 (diff)
expo: Drop scene_title_set()
This function is really just an assignment, so serves no useful purpose. Drop it. Signed-off-by: Simon Glass <sjg@chromium.org>
-rw-r--r--boot/expo_build.c4
-rw-r--r--boot/scene.c7
-rw-r--r--include/expo.h9
-rw-r--r--test/boot/expo.c2
4 files changed, 3 insertions, 19 deletions
diff --git a/boot/expo_build.c b/boot/expo_build.c
index 930cc40ec07..d97347e1725 100644
--- a/boot/expo_build.c
+++ b/boot/expo_build.c
@@ -404,7 +404,7 @@ static int scene_build(struct build_info *info, ofnode scn_node,
if (ret < 0)
return log_msg_ret("tit", 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);
if (ret < 0)
@@ -420,7 +420,7 @@ static int scene_build(struct build_info *info, ofnode scn_node,
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;
struct expo *exp;
diff --git a/boot/scene.c b/boot/scene.c
index a4836000b28..3290a40222a 100644
--- a/boot/scene.c
+++ b/boot/scene.c
@@ -70,13 +70,6 @@ void scene_destroy(struct scene *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)
{
return list_count_nodes(&scn->obj_head);
diff --git a/include/expo.h b/include/expo.h
index acff98ea65b..8cb37260db5 100644
--- a/include/expo.h
+++ b/include/expo.h
@@ -541,15 +541,6 @@ void scene_set_highlight_id(struct scene *scn, uint id);
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
*
* @scn: Scene to check
diff --git a/test/boot/expo.c b/test/boot/expo.c
index 1c2e746decc..db14ff86f8b 100644
--- a/test/boot/expo.c
+++ b/test/boot/expo.c
@@ -151,7 +151,7 @@ static int expo_scene(struct unit_test_state *uts)
scn = NULL;
id = scene_new(exp, SCENE_NAME2, 0, &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 + 2, exp->next_id);
ut_asserteq_ptr(exp, scn->expo);