Edward O'Callaghan submitted this change.

View Change



1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.

Approvals: build bot (Jenkins): Verified Thomas Heijligen: Looks good to me, approved
board_enable.c: Clean up board_handle_phase()

The board_enable_safetycheck() call already checks nullarity
of the function pointer.

Change-Id: I956961ee7204d3a6a9066ba5945f95af1411e700
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/73453
Reviewed-by: Thomas Heijligen <src@posteo.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
M board_enable.c
1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/board_enable.c b/board_enable.c
index 0531fab..bf7897b 100644
--- a/board_enable.c
+++ b/board_enable.c
@@ -2707,12 +2707,7 @@
/* FIXME: Should this be identical to board_flash_enable? */
static int board_handle_phase(enum board_match_phase phase, bool force_boardenable)
{
- const struct board_match *board = NULL;
-
- board = board_match_pci_ids(phase);
-
- if (!board)
- return 0;
+ const struct board_match *board = board_match_pci_ids(phase);

if (board_enable_safetycheck(board, force_boardenable))
return 0;

To view, visit change 73453. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: I956961ee7204d3a6a9066ba5945f95af1411e700
Gerrit-Change-Number: 73453
Gerrit-PatchSet: 4
Gerrit-Owner: Edward O'Callaghan <quasisec@chromium.org>
Gerrit-Reviewer: Edward O'Callaghan <quasisec@chromium.org>
Gerrit-Reviewer: Thomas Heijligen <src@posteo.de>
Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org>
Gerrit-MessageType: merged