From a2d09ca893edd4519a733f29c22a45c0a9a3efe3 Mon Sep 17 00:00:00 2001 From: Anastasia Klimchuk Date: Mon, 27 Sep 2021 14:44:19 +1000 Subject: raiden_debug_spi: Use new API to register shutdown function This allows programmer 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. BUG=b:185191942 TEST=test in CB:57918 (Nikolai) tested probe/read/write with a servo micro and puff board Change-Id: I8927224779f24d1fda088991337e54d7272775a6 Signed-off-by: Anastasia Klimchuk Tested-by: Nikolai Artemiev Reviewed-on: https://review.coreboot.org/c/flashrom/+/57975 Reviewed-by: Nikolai Artemiev Reviewed-by: Angel Pons Reviewed-by: Nico Huber Tested-by: build bot (Jenkins) --- raiden_debug_spi.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/raiden_debug_spi.c b/raiden_debug_spi.c index a2fddb45..3f355523 100644 --- a/raiden_debug_spi.c +++ b/raiden_debug_spi.c @@ -1298,6 +1298,7 @@ static const struct spi_master spi_master_raiden_debug = { .read = default_spi_read, .write_256 = default_spi_write_256, .write_aai = default_spi_write_aai, + .shutdown = raiden_debug_spi_shutdown, }; static int match_endpoint(struct libusb_endpoint_descriptor const *descriptor, @@ -1611,10 +1612,7 @@ loop_end: return SPI_GENERIC_ERROR; } - register_spi_master(spi_config, data); - register_shutdown(raiden_debug_spi_shutdown, data); - - return 0; + return register_spi_master(spi_config, data); } const struct programmer_entry programmer_raiden_debug_spi = { -- cgit v1.2.3