[S] Change in flashrom[master]: ni845x_spi: handle errors using goto during initialization

[Anastasia Klimchuk (Code Review)]

Anastasia Klimchuk has submitted this change. ( https://review.coreboot.org/c/flashrom/+/72156?usp=email )

 ( 

3 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.
 )Change subject: ni845x_spi: handle errors using goto during initialization
......................................................................

ni845x_spi: handle errors using goto during initialization

This patch prepares the programmer to move global singleton states
into a struct.

TOPIC=register_master_api

Change-Id: Ie9620d59db229729fd8523f99b0917d938bcc4ed
Signed-off-by: Alexander Goncharov <[e-mail]>
Ticket: https://ticket.coreboot.org/issues/391
Reviewed-on: https://review.coreboot.org/c/flashrom/+/72156
Reviewed-by: Miklós Márton <[e-mail]>
Tested-by: build bot (Jenkins) <[e-mail]>
Reviewed-by: Anastasia Klimchuk <[e-mail]>
---
M ni845x_spi.c
1 file changed, 8 insertions(+), 6 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Anastasia Klimchuk: Looks good to me, approved
  Miklós Márton: Looks good to me, approved




diff --git a/ni845x_spi.c b/ni845x_spi.c
index cb6b22e..58a8ef4 100644
--- a/ni845x_spi.c
+++ b/ni845x_spi.c
@@ -622,22 +622,24 @@
 	tmp = ni845xSpiConfigurationOpen(&configuration_handle);
 	if (tmp != 0) {
 		ni845x_report_error("ni845xSpiConfigurationOpen", tmp);
-		ni845x_spi_shutdown(NULL);
-		return 1;
+		goto err;
 	}
 
 	if (usb8452_spi_set_io_voltage(requested_io_voltage_mV, &io_voltage_in_mV, USE_LOWER, device_pid, device_handle) < 0) {
-		ni845x_spi_shutdown(NULL);
-		return 1;	// no alert here usb8452_spi_set_io_voltage already printed that
+		// no alert here usb8452_spi_set_io_voltage already printed that
+		goto err;
 	}
 
 	if (ni845x_spi_set_speed(configuration_handle, spi_speed_KHz)) {
 		msg_perr("Unable to set SPI speed\n");
-		ni845x_spi_shutdown(NULL);
-		return 1;
+		goto err;
 	}
 
 	return register_spi_master(&spi_programmer_ni845x, NULL);
+
+err:
+	ni845x_spi_shutdown(NULL);
+	return 1;
 }
 
 const struct programmer_entry programmer_ni845x_spi = {

-- 
To view, visit https://review.coreboot.org/c/flashrom/+/72156?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: Ie9620d59db229729fd8523f99b0917d938bcc4ed
Gerrit-Change-Number: 72156
Gerrit-PatchSet: 6
Gerrit-Owner: Alexander Goncharov <[e-mail]>
Gerrit-Reviewer: Anastasia Klimchuk <[e-mail]>
Gerrit-Reviewer: Miklós Márton <[e-mail]>
Gerrit-Reviewer: build bot (Jenkins) <[e-mail]>
Gerrit-MessageType: merged