openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-28 07:23:43 +02:00
Code Issues Releases Wiki Activity

ene_lpc.c: Move register_shutdown to the end of initialisation

Browse Source 
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 <aklm@chromium.org>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/52406
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Nico Huber <nico.h@gmx.de>
This commit is contained in:
Anastasia Klimchuk 2021-04-16 14:54:41 +10:00 committed by Nico Huber
parent 75b4536085
commit fbf3479c71
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ene_lpc.c
View File

@ -559,16 +559,15 @@ int ene_lpc_init()
* Compal - ec_command(0x41, 0xa1) returns 43 4f 4d 50 41 4c 9c * 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)) { if (register_shutdown(ene_leave_flash_mode, ctx_data)) {
ret = 1; ret = 1;
goto ene_probe_spi_flash_exit; 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); register_spi_master(&spi_master_ene);
msg_pdbg("%s: successfully initialized ene\n", __func__); msg_pdbg("%s: successfully initialized ene\n", __func__);