Angel Pons has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/42514 )
Change subject: vc/google/chromeos/elog.c: Clean up code ......................................................................
vc/google/chromeos/elog.c: Clean up code
Constify local variables and drop redundant logic, while preserving the original behavior. While we are at it, also reflow print statements.
Change-Id: Id024f3ac717dad98c4287add9b33defde7a0028d Signed-off-by: Angel Pons th3fanbus@gmail.com --- M src/vendorcode/google/chromeos/elog.c 1 file changed, 9 insertions(+), 20 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/14/42514/1
diff --git a/src/vendorcode/google/chromeos/elog.c b/src/vendorcode/google/chromeos/elog.c index 4dd8b19..523b7c4 100644 --- a/src/vendorcode/google/chromeos/elog.c +++ b/src/vendorcode/google/chromeos/elog.c @@ -8,32 +8,21 @@
static void elog_add_boot_reason(void *unused) { - int rec = vboot_recovery_mode_enabled(); - int dev = vboot_developer_mode_enabled(); - - if (!rec && !dev) - return; + const int rec = vboot_recovery_mode_enabled(); + const int dev = vboot_developer_mode_enabled();
if (rec) { - u8 reason = vboot_check_recovery_request(); + const u8 reason = vboot_check_recovery_request(); elog_add_event_byte(ELOG_TYPE_CROS_RECOVERY_MODE, reason); - printk(BIOS_DEBUG, "%s: Logged recovery mode boot%s, " - "reason: 0x%02x\n", __func__, - dev ? " (Dev-switch on)" : "", reason); + printk(BIOS_DEBUG, "%s: Logged recovery mode boot%s, reason: 0x%02x\n", + __func__, dev ? " (Dev-switch on)" : "", reason); }
- if (dev) { - int log_event = 1; + /* Skip logging developer mode in ACPI resume path */ + if (dev && !acpi_is_wakeup()) {
- /* Skip logging developer mode in ACPI resume path */ - if (acpi_is_wakeup()) - log_event = 0; - - if (log_event) { - elog_add_event(ELOG_TYPE_CROS_DEVELOPER_MODE); - printk(BIOS_DEBUG, "%s: Logged dev mode boot\n", - __func__); - } + elog_add_event(ELOG_TYPE_CROS_DEVELOPER_MODE); + printk(BIOS_DEBUG, "%s: Logged dev mode boot\n", __func__); } }
Aaron Durbin has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42514 )
Change subject: vc/google/chromeos/elog.c: Clean up code ......................................................................
Patch Set 1: Code-Review+2
Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42514 )
Change subject: vc/google/chromeos/elog.c: Clean up code ......................................................................
Patch Set 1: Code-Review+2
Angel Pons has removed a vote from this change. ( https://review.coreboot.org/c/coreboot/+/42514 )
Change subject: vc/google/chromeos/elog.c: Clean up code ......................................................................
Removed Verified+1 by build bot (Jenkins) no-reply@coreboot.org
Angel Pons has submitted this change. ( https://review.coreboot.org/c/coreboot/+/42514 )
Change subject: vc/google/chromeos/elog.c: Clean up code ......................................................................
vc/google/chromeos/elog.c: Clean up code
Constify local variables and drop redundant logic, while preserving the original behavior. While we are at it, also reflow print statements.
Change-Id: Id024f3ac717dad98c4287add9b33defde7a0028d Signed-off-by: Angel Pons th3fanbus@gmail.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/42514 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Aaron Durbin adurbin@chromium.org Reviewed-by: Furquan Shaikh furquan@google.com --- M src/vendorcode/google/chromeos/elog.c 1 file changed, 9 insertions(+), 20 deletions(-)
Approvals: build bot (Jenkins): Verified Aaron Durbin: Looks good to me, approved Furquan Shaikh: Looks good to me, approved
diff --git a/src/vendorcode/google/chromeos/elog.c b/src/vendorcode/google/chromeos/elog.c index 4dd8b19..523b7c4 100644 --- a/src/vendorcode/google/chromeos/elog.c +++ b/src/vendorcode/google/chromeos/elog.c @@ -8,32 +8,21 @@
static void elog_add_boot_reason(void *unused) { - int rec = vboot_recovery_mode_enabled(); - int dev = vboot_developer_mode_enabled(); - - if (!rec && !dev) - return; + const int rec = vboot_recovery_mode_enabled(); + const int dev = vboot_developer_mode_enabled();
if (rec) { - u8 reason = vboot_check_recovery_request(); + const u8 reason = vboot_check_recovery_request(); elog_add_event_byte(ELOG_TYPE_CROS_RECOVERY_MODE, reason); - printk(BIOS_DEBUG, "%s: Logged recovery mode boot%s, " - "reason: 0x%02x\n", __func__, - dev ? " (Dev-switch on)" : "", reason); + printk(BIOS_DEBUG, "%s: Logged recovery mode boot%s, reason: 0x%02x\n", + __func__, dev ? " (Dev-switch on)" : "", reason); }
- if (dev) { - int log_event = 1; + /* Skip logging developer mode in ACPI resume path */ + if (dev && !acpi_is_wakeup()) {
- /* Skip logging developer mode in ACPI resume path */ - if (acpi_is_wakeup()) - log_event = 0; - - if (log_event) { - elog_add_event(ELOG_TYPE_CROS_DEVELOPER_MODE); - printk(BIOS_DEBUG, "%s: Logged dev mode boot\n", - __func__); - } + elog_add_event(ELOG_TYPE_CROS_DEVELOPER_MODE); + printk(BIOS_DEBUG, "%s: Logged dev mode boot\n", __func__); } }
-
Aaron Durbin (Code Review) -
Angel Pons (Code Review)
-
Furquan Shaikh (Code Review)