[flashrom-gerrit] Change in flashrom[master]: buspirate_spi: Use non-zero return value from buspirate_sendrecv

[Angel Pons (Code Review)]

Angel Pons has submitted this change. ( https://review.coreboot.org/c/flashrom/+/55818 )

Change subject: buspirate_spi: Use non-zero return value from buspirate_sendrecv
......................................................................

buspirate_spi: Use non-zero return value from buspirate_sendrecv

Return values for buspirate_sendrecv come from serialport_write
and serialport_read, and those return 1s for any error. No need
to explicity assign ret = 1, because it is already 1 for error.

Follow up on commit 751afa88a7f22487069665c5d206ae490f158231
where this idea was suggested.

BUG=b:185191942
TEST=builds

Change-Id: I31fd70f607dc965d5cac1cd0116faa447dbc177a
Signed-off-by: Anastasia Klimchuk 
Reviewed-on: https://review.coreboot.org/c/flashrom/+/55818
Reviewed-by: Angel Pons 
Tested-by: build bot (Jenkins) 
---
M buspirate_spi.c
1 file changed, 5 insertions(+), 15 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Angel Pons: Looks good to me, approved

diff --git a/buspirate_spi.c b/buspirate_spi.c
index bfd0e05..b56d422 100644
--- a/buspirate_spi.c
+++ b/buspirate_spi.c
@@ -629,10 +629,8 @@
    /* Enter raw SPI mode */
    bp_commbuf[0] = 0x01;
    ret = buspirate_sendrecv(bp_commbuf, 1, 0);
-	if (ret) {
-		ret = 1;
+	if (ret)
    	goto init_err_cleanup_exit;
-	}
    if ((ret = buspirate_wait_for_string(bp_commbuf, "SPI")))
    	goto init_err_cleanup_exit;
    if ((ret = buspirate_sendrecv(bp_commbuf, 0, 1)))
@@ -655,10 +653,8 @@
    	msg_pdbg("Enabling PSUs.\n");
    }
    ret = buspirate_sendrecv(bp_commbuf, 1, 1);
-	if (ret) {
-		ret = 1;
+	if (ret)
    	goto init_err_cleanup_exit;
-	}
    if (bp_commbuf[0] != 0x01) {
    	msg_perr("Protocol error while setting power/CS/AUX(/Pull-up resistors)!\n");
    	ret = 1;
@@ -668,10 +664,8 @@
    /* Set SPI speed */
    bp_commbuf[0] = 0x60 | spispeed;
    ret = buspirate_sendrecv(bp_commbuf, 1, 1);
-	if (ret) {
-		ret = 1;
+	if (ret)
    	goto init_err_cleanup_exit;
-	}
    if (bp_commbuf[0] != 0x01) {
    	msg_perr("Protocol error while setting SPI speed!\n");
    	ret = 1;
@@ -685,10 +679,8 @@
    	msg_pdbg("Pull-ups enabled, so using HiZ pin output! (Open-Drain mode)\n");
    }
    ret = buspirate_sendrecv(bp_commbuf, 1, 1);
-	if (ret) {
-		ret = 1;
+	if (ret)
    	goto init_err_cleanup_exit;
-	}
    if (bp_commbuf[0] != 0x01) {
    	msg_perr("Protocol error while setting SPI config!\n");
    	ret = 1;
@@ -698,10 +690,8 @@
    /* De-assert CS# */
    bp_commbuf[0] = 0x03;
    ret = buspirate_sendrecv(bp_commbuf, 1, 1);
-	if (ret) {
-		ret = 1;
+	if (ret)
    	goto init_err_cleanup_exit;
-	}
    if (bp_commbuf[0] != 0x01) {
    	msg_perr("Protocol error while raising CS#!\n");
    	ret = 1;