From 9305f44240865a4b87d231a9760561ff652ca1b9 Mon Sep 17 00:00:00 2001 From: Paul Kocialkowski Date: Sat, 14 May 2016 15:30:52 +0200 Subject: [PATCH] UPSTREAM: vboot: Call verification_should_run directly in the if statement Using a dedicated variable is slightly less readable and makes the code less consistent, given that other test functions are called directly in the if statements. Change-Id: If52b2a4268acb1e2187574d15cc73a0c1d5fe9bb Original-Signed-off-by: Paul Kocialkowski Original-Reviewed-on: https://review.coreboot.org/14817 Original-Reviewed-by: Aaron Durbin (cherry-picked from commit 1811768c649ac0d0a8af30570ecaa1b1f3b44c6b) Signed-off-by: Martin Roth Reviewed-on: https://chromium-review.googlesource.com/346519 Reviewed-by: Stefan Reinauer Commit-Queue: Stefan Reinauer Tested-by: Stefan Reinauer --- src/vendorcode/google/chromeos/vboot2/vboot_loader.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/vendorcode/google/chromeos/vboot2/vboot_loader.c b/src/vendorcode/google/chromeos/vboot2/vboot_loader.c index 590061331d..f6efe0f2c7 100644 --- a/src/vendorcode/google/chromeos/vboot2/vboot_loader.c +++ b/src/vendorcode/google/chromeos/vboot2/vboot_loader.c @@ -88,11 +88,7 @@ static int vboot_logic_executed(void) static void vboot_prepare(void) { - int run_verification; - - run_verification = verification_should_run(); - - if (run_verification) { + if (verification_should_run()) { verstage_main(); car_set_var(vboot_executed, 1); } else if (verstage_should_load()) {