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>

diff --git a/boot/expo_build.c b/boot/expo_build.c
index 930cc40ec076a8a68e68e5ea32f03c805375dd29..d97347e1725381c366eb25085ccb0b2885564748 100644 (file)
--- 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 a4836000b2859c45d1ce01b5b51e4750a70a552c..3290a40222afa1c7c23aeb2e7e51ea6efc99b848 100644 (file)
--- 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 acff98ea65ba3b6530aba94521ca12e68d26037e..8cb37260db53e8904ecec7254868934f812a4513 100644 (file)
--- a/include/expo.h
+++ b/include/expo.h
@@ -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);
 
-/**
- * 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
  *

diff --git a/test/boot/expo.c b/test/boot/expo.c
index 1c2e746deccc60f0cdc0369a08cd6a0632a0294a..db14ff86f8b52d56c6605378b9945356aaec5212 100644 (file)
--- 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);