diff options
| author | Simon Glass <sjg@chromium.org> | 2024-01-04 08:11:43 -0700 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-04-11 08:32:04 -0600 |
| commit | adb2770e8a9b1707531fe5d1c28bea8ffa217387 (patch) | |
| tree | 788efef3d436a9075798982d1b90940cc76e91a4 | |
| parent | 7d991c15d7ce12a78abd789b0487c37c06c2fef5 (diff) | |
| download | u-boot-adb2770e8a9b1707531fe5d1c28bea8ffa217387.zip u-boot-adb2770e8a9b1707531fe5d1c28bea8ffa217387.tar.gz u-boot-adb2770e8a9b1707531fe5d1c28bea8ffa217387.tar.bz2 | |
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.c | 4 | ||||
| -rw-r--r-- | boot/scene.c | 7 | ||||
| -rw-r--r-- | include/expo.h | 9 | ||||
| -rw-r--r-- | test/boot/expo.c | 2 |
4 files changed, 3 insertions, 19 deletions
diff --git a/boot/expo_build.c b/boot/expo_build.c index 71aa03f..ae0ffd2 100644 --- a/boot/expo_build.c +++ b/boot/expo_build.c @@ -405,7 +405,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) @@ -421,7 +421,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 56569e7..1369bcd 100644 --- a/boot/scene.c +++ b/boot/scene.c @@ -71,13 +71,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) { struct scene_obj *obj; diff --git a/include/expo.h b/include/expo.h index 658ff00..8e834b5 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 75f31fe..c7b8e9b 100644 --- a/test/boot/expo.c +++ b/test/boot/expo.c @@ -152,7 +152,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); |