summaryrefslogtreecommitdiff
path: root/firmware/lib/vboot_display.c
diff options
context:
space:
mode:
authorJoel Kitching <kitching@google.com>2019-07-29 18:51:00 +0800
committerCommit Bot <commit-bot@chromium.org>2019-08-13 08:23:54 +0000
commitcf49e7b6ae5abee0552b596ec11b695b5d15853c (patch)
treea6a6ef6cdf73ee3078b07f0c195795d67c625b0b /firmware/lib/vboot_display.c
parente6b803355ee3dc548a4519a71b29672d856f9bc5 (diff)
downloadvboot-cf49e7b6ae5abee0552b596ec11b695b5d15853c.tar.gz
vboot: replace VBERROR_SUCCESS with VB2_SUCCESS
Replace vboot1-style VBERROR_SUCCESS with VB2_SUCCESS (trivial change since both are equal values). BUG=b:124141368, chromium:988410 TEST=make clean && make runtests BRANCH=none Change-Id: I46e02471a031e9f36ec869d11d0b957d1c1b5769 Signed-off-by: Joel Kitching <kitching@google.com> Cq-Depend: chromium:1728114 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1722915 Commit-Queue: Joel Kitching <kitching@chromium.org> Tested-by: Joel Kitching <kitching@chromium.org> Reviewed-by: Julius Werner <jwerner@chromium.org>
Diffstat (limited to 'firmware/lib/vboot_display.c')
-rw-r--r--firmware/lib/vboot_display.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/firmware/lib/vboot_display.c b/firmware/lib/vboot_display.c
index 364cd131..6661885e 100644
--- a/firmware/lib/vboot_display.c
+++ b/firmware/lib/vboot_display.c
@@ -39,7 +39,7 @@ vb2_error_t VbDisplayScreen(struct vb2_context *ctx, uint32_t screen, int force,
/* If requested screen is the same as the current one, we're done. */
if (disp_current_screen == screen && !force)
- return VBERROR_SUCCESS;
+ return VB2_SUCCESS;
/* Keep track of the currently displayed screen */
disp_current_screen = screen;
@@ -63,7 +63,7 @@ vb2_error_t VbDisplayMenu(struct vb2_context *ctx, uint32_t screen, int force,
if (disp_current_screen == screen &&
disp_current_index == selected_index &&
!force)
- return VBERROR_SUCCESS;
+ return VB2_SUCCESS;
/*
* If current screen is not the same, make sure we redraw the base
@@ -430,7 +430,7 @@ vb2_error_t VbCheckDisplayKey(struct vb2_context *ctx, uint32_t key,
case VB_KEY_DOWN:
/* Arrow keys = change localization */
loc = vb2_nv_get(ctx, VB2_NV_LOCALIZATION_INDEX);
- if (VBERROR_SUCCESS != VbExGetLocalizationCount(&count))
+ if (VB2_SUCCESS != VbExGetLocalizationCount(&count))
loc = 0; /* No localization count (bad GBB?) */
else if (VB_KEY_RIGHT == key || VB_KEY_UP == key)
loc = (loc < count - 1 ? loc + 1 : 0);
@@ -458,5 +458,5 @@ vb2_error_t VbCheckDisplayKey(struct vb2_context *ctx, uint32_t key,
return VbDisplayScreen(ctx, disp_current_screen, 1, data);
}
- return VBERROR_SUCCESS;
+ return VB2_SUCCESS;
}