[v2,09/19] expo: Drop unneceesary calls to expo_str()

Message ID	20240104151152.697855-10-sjg@chromium.org
State	Changes Requested
Delegated to:	Tom Rini
Headers	show Return-Path: <u-boot-bounces@lists.denx.de> From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Cc: Tom Rini <trini@konsulko.com>, Simon Glass <sjg@chromium.org>, Bin Meng <bmeng.cn@gmail.com>, Anatolij Gustschin <agust@denx.de> Subject: [PATCH v2 09/19] expo: Drop unneceesary calls to expo_str() Date: Thu, 4 Jan 2024 08:11:42 -0700 Message-Id: <20240104151152.697855-10-sjg@chromium.org> In-Reply-To: <20240104151152.697855-1-sjg@chromium.org> References: <20240104151152.697855-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: list Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de>
Series	x86: expo: Add support for editing coreboot CMOS RAM settings \| expand [v2,00/19] x86: expo: Add support for editing coreboot CMOS RAM settings [v2,01/19] video: Add a dark-grey console colour [v2,02/19] video: Avoid starting a new line to close to the bottom [v2,03/19] expo: Place menu items to the right of all labels [v2,04/19] expo: Set the initial next_id to 1 [v2,05/19] expo: Use standard numbering for save and discard [v2,06/19] expo: Allow menu items to have values [v2,07/19] expo: Add a little more cedit CMOS logging [v2,08/19] expo: Support menu-item values in cedit [v2,09/19] expo: Drop unneceesary calls to expo_str() [v2,10/19] expo: Drop scene_title_set() [v2,11/19] expo: Add forward declaration for udevice to cedit [v2,12/19] x86: coreboot: Enable unit tests [v2,13/19] x86: CI: Update coreboot [v2,14/19] x86: coreboot: Add a test for cbsysinfo command [v2,15/19] x86: coreboot: Show the option table [v2,16/19] x86: coreboot: Enable support for the configuration editor [v2,17/19] x86: coreboot: Add a command to check and update CMOS RAM [v2,18/19] x86: coreboot: Allow building an expo for editing CMOS config [v2,19/19] x86: Enable RTC command by default

Message ID

20240104151152.697855-10-sjg@chromium.org

State

Changes Requested

Delegated to:

Tom Rini

Headers

From: Simon Glass <sjg@chromium.org>
To: U-Boot Mailing List <u-boot@lists.denx.de>
Cc: Tom Rini <trini@konsulko.com>, Simon Glass <sjg@chromium.org>,
 Bin Meng <bmeng.cn@gmail.com>, Anatolij Gustschin <agust@denx.de>
Subject: [PATCH v2 09/19] expo: Drop unneceesary calls to expo_str()
Date: Thu,  4 Jan 2024 08:11:42 -0700
Message-Id: <20240104151152.697855-10-sjg@chromium.org>
In-Reply-To: <20240104151152.697855-1-sjg@chromium.org>
References: <20240104151152.697855-1-sjg@chromium.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: list
Errors-To: u-boot-bounces@lists.denx.de
Sender: "U-Boot" <u-boot-bounces@lists.denx.de>

Series

x86: expo: Add support for editing coreboot CMOS RAM settings | expand

Commit Message

Simon Glass Jan. 4, 2024, 3:11 p.m. UTC

The scene_txt_str() function calls expo_str() so there is no need to
call it beforehand. Drop this unnecessary code.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

(no changes since v1)

 boot/expo_build.c | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/boot/expo_build.c b/boot/expo_build.c
index 3458bf12c67..71aa03f2826 100644
--- a/boot/expo_build.c
+++ b/boot/expo_build.c
@@ -47,7 +47,6 @@  int add_txt_str(struct build_info *info, ofnode node, struct scene *scn,
 		const char *find_name, uint obj_id)
 {
 	const char *text;
-	uint str_id;
 	int ret;
 
 	info->err_prop = find_name;
@@ -68,12 +67,7 @@  int add_txt_str(struct build_info *info, ofnode node, struct scene *scn,
 			return log_msg_ret("id", -EINVAL);
 	}
 
-	ret = expo_str(scn->expo, find_name, 0, text);
-	if (ret < 0)
-		return log_msg_ret("add", ret);
-	str_id = ret;
-
-	ret = scene_txt_str(scn, find_name, obj_id, str_id, text, NULL);
+	ret = scene_txt_str(scn, find_name, obj_id, 0, text, NULL);
 	if (ret < 0)
 		return log_msg_ret("add", ret);
 
@@ -95,7 +89,6 @@  int add_txt_str_list(struct build_info *info, ofnode node, struct scene *scn,
 		     const char *find_name, int index, uint obj_id)
 {
 	const char *text;
-	uint str_id;
 	int ret;
 
 	ret = ofnode_read_string_index(node, find_name, index, &text);
@@ -115,12 +108,7 @@  int add_txt_str_list(struct build_info *info, ofnode node, struct scene *scn,
 			return log_msg_ret("id", -EINVAL);
 	}
 
-	ret = expo_str(scn->expo, find_name, 0, text);
-	if (ret < 0)
-		return log_msg_ret("add", ret);
-	str_id = ret;
-
-	ret = scene_txt_str(scn, find_name, obj_id, str_id, text, NULL);
+	ret = scene_txt_str(scn, find_name, obj_id, 0, text, NULL);
 	if (ret < 0)
 		return log_msg_ret("add", ret);

[v2,09/19] expo: Drop unneceesary calls to expo_str()

Commit Message

Patch