openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-07-01 14:11:15 +02:00
Code Issues Releases Wiki Activity

spi_master: Use new API to register shutdown function

Browse Source 
This allows spi masters to register shutdown function in spi_master
struct, which means there is no need to call register_shutdown in init
function, since this call is now a part of register_spi_master.

As a consequence of using new API, two things are happening here:
1) No resource leakage anymore in case register_shutdown() would fail,
2) Fixed propagation of register_spi_master() return values.

Basic testing: when I comment out free(data) in linux_spi_shutdown, test
fails with error
../linux_spi.c:235: note: block 0x55a4db276510 allocated here
ERROR: linux_spi_init_and_shutdown_test_success leaked 1 block(s)
Means, shutdown function is invoked.

BUG=b:185191942
TEST= 1) builds and ninja test including CB:56911
2) On ARMv7 device
flashrom -p linux_spi -V
-> using linux_spi, chip found
3) On x86_64 AMD device
flashrom -p internal -V
-> this is actually using sb600spi, chip found

Change-Id: Ib60300f9ddb295a255d5ef3f8da0e07064207140
Signed-off-by: Anastasia Klimchuk <aklm@chromium.org>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/56103
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
This commit is contained in:
Anastasia Klimchuk
2021-07-06 16:18:44 +10:00
committed by Edward O'Callaghan
parent 9db8e12c16
commit a69c5196d2
21 changed files with 40 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ft2232_spi.c
View File

@ -291,6 +291,7 @@ static const struct spi_master spi_master_ft2232 = {
.read = default_spi_read,
.write_256 = default_spi_write_256,
.write_aai = default_spi_write_aai,
.shutdown = ft2232_shutdown,
};
/* Returns 0 upon success, a negative number upon errors. */
@ -579,13 +580,7 @@ static int ft2232_spi_init(void)
spi_data->pindir = pindir;
spi_data->ftdic_context = ftdic;
if (register_shutdown(ft2232_shutdown, spi_data)) {
free(spi_data);
goto ftdi_err;
}
register_spi_master(&spi_master_ft2232, spi_data);
return 0;
return register_spi_master(&spi_master_ft2232, spi_data);
ftdi_err:
if ((f = ftdi_usb_close(&ftdic)) < 0) {