From fbf3479c71ab5e800de71bffd3d0844b9588614f Mon Sep 17 00:00:00 2001 From: Anastasia Klimchuk Date: Fri, 16 Apr 2021 14:54:41 +1000 Subject: ene_lpc.c: Move register_shutdown to the end of initialisation A bit more details: since register_shutdown has moved a few lines below, now ene_enter_flash_mode is called before the shutdown function is registered. ene_enter_flash_mode can fail (at least in theory, it has some return 1s), but its return value is not analyzed, so even if it returns non-0, execution goes further and register_shutdown will happen anyway. It is a separate question whether the return value of ene_enter_flash_mode needs to be analyzed or is it ok to ignore it, but in this patch I plan to keep the same behaviour, and probably I will get back to error handling later. This unlocks API change which plans to move register_shutdown inside register master API, see https://review.coreboot.org/c/flashrom/+/51761 TEST=builds BUG=b:185191942 Change-Id: If89a758c91c77486adbac2779449bcd71ab8fc78 Signed-off-by: Anastasia Klimchuk Reviewed-on: https://review.coreboot.org/c/flashrom/+/52406 Tested-by: build bot (Jenkins) Reviewed-by: Angel Pons Reviewed-by: Nico Huber --- ene_lpc.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/ene_lpc.c b/ene_lpc.c index 993ef4d10..1d045b841 100644 --- a/ene_lpc.c +++ b/ene_lpc.c @@ -559,16 +559,15 @@ int ene_lpc_init() * Compal - ec_command(0x41, 0xa1) returns 43 4f 4d 50 41 4c 9c */ + ene_enter_flash_mode(ctx_data); + + internal_buses_supported |= BUS_LPC; + spi_master_ene.data = ctx_data; if (register_shutdown(ene_leave_flash_mode, ctx_data)) { ret = 1; goto ene_probe_spi_flash_exit; } - - ene_enter_flash_mode(ctx_data); - - internal_buses_supported |= BUS_LPC; - spi_master_ene.data = ctx_data; register_spi_master(&spi_master_ene); msg_pdbg("%s: successfully initialized ene\n", __func__); -- cgit v1.2.3