diff --git a/src/drivers/spi/eon.c b/src/drivers/spi/eon.c
index 21103ae221..a5e4d66e2e 100644
--- a/src/drivers/spi/eon.c
+++ b/src/drivers/spi/eon.c
@@ -63,7 +63,7 @@ static int eon_write(struct spi_flash *flash,
 	unsigned long page_size;
 	size_t chunk_len;
 	size_t actual;
-	int ret;
+	int ret = 0;
 	u8 cmd[4];
 
 	page_size = eon->params->page_size;
@@ -71,13 +71,7 @@ static int eon_write(struct spi_flash *flash,
 	byte_addr = offset % page_size;
 
 	flash->spi->rw = SPI_WRITE_FLAG;
-	ret = spi_claim_bus(flash->spi);
-	if (ret) {
-		printk(BIOS_WARNING, "SF: Unable to claim SPI bus\n");
-		return ret;
-	}
 
-	ret = 0;
 	for (actual = 0; actual < len; actual += chunk_len) {
 		chunk_len = min(len - actual, page_size - byte_addr);
 
@@ -118,7 +112,6 @@ static int eon_write(struct spi_flash *flash,
 	      len, offset);
 #endif
 
-	spi_release_bus(flash->spi);
 	return ret;
 }
 
diff --git a/src/drivers/spi/gigadevice.c b/src/drivers/spi/gigadevice.c
index 5a8f82f053..135307949e 100644
--- a/src/drivers/spi/gigadevice.c
+++ b/src/drivers/spi/gigadevice.c
@@ -125,19 +125,13 @@ static int gigadevice_write(struct spi_flash *flash, u32 offset,
 	unsigned long page_size;
 	size_t chunk_len;
 	size_t actual;
-	int ret;
+	int ret = 0;
 	u8 cmd[4];
 
 	page_size = min(1 << stm->params->l2_page_size, CONTROLLER_PAGE_LIMIT);
 	byte_addr = offset % page_size;
 
 	flash->spi->rw = SPI_WRITE_FLAG;
-	ret = spi_claim_bus(flash->spi);
-	if (ret) {
-		printk(BIOS_WARNING,
-		       "SF gigadevice.c: Unable to claim SPI bus\n");
-		return ret;
-	}
 
 	for (actual = 0; actual < len; actual += chunk_len) {
 		chunk_len = min(len - actual, page_size - byte_addr);
@@ -185,7 +179,6 @@ static int gigadevice_write(struct spi_flash *flash, u32 offset,
 	ret = 0;
 
 out:
-	spi_release_bus(flash->spi);
 	return ret;
 }
 
diff --git a/src/drivers/spi/macronix.c b/src/drivers/spi/macronix.c
index bbc3704656..4ba0d63b56 100644
--- a/src/drivers/spi/macronix.c
+++ b/src/drivers/spi/macronix.c
@@ -128,20 +128,14 @@ static int macronix_write(struct spi_flash *flash,
 	unsigned long page_size;
 	size_t chunk_len;
 	size_t actual;
-	int ret;
+	int ret = 0;
 	u8 cmd[4];
 
 	page_size = min(mcx->params->page_size, CONTROLLER_PAGE_LIMIT);
 	byte_addr = offset % page_size;
 
 	flash->spi->rw = SPI_WRITE_FLAG;
-	ret = spi_claim_bus(flash->spi);
-	if (ret) {
-		printk(BIOS_WARNING, "SF: Unable to claim SPI bus\n");
-		return ret;
-	}
 
-	ret = 0;
 	for (actual = 0; actual < len; actual += chunk_len) {
 		chunk_len = min(len - actual, page_size - byte_addr);
 
@@ -182,7 +176,6 @@ static int macronix_write(struct spi_flash *flash,
 	      " 0x%lx\n", len, (unsigned long)(offset - len));
 #endif
 
-	spi_release_bus(flash->spi);
 	return ret;
 }
 
diff --git a/src/drivers/spi/spansion.c b/src/drivers/spi/spansion.c
index 6dd6df921a..8808f59e97 100644
--- a/src/drivers/spi/spansion.c
+++ b/src/drivers/spi/spansion.c
@@ -140,7 +140,7 @@ static int spansion_write(struct spi_flash *flash,
 	unsigned long page_size;
 	size_t chunk_len;
 	size_t actual;
-	int ret;
+	int ret = 0;
 	u8 cmd[4];
 
 	page_size = spsn->params->page_size;
@@ -148,13 +148,7 @@ static int spansion_write(struct spi_flash *flash,
 	byte_addr = offset % page_size;
 
 	flash->spi->rw = SPI_WRITE_FLAG;
-	ret = spi_claim_bus(flash->spi);
-	if (ret) {
-		printk(BIOS_WARNING, "SF: Unable to claim SPI bus\n");
-		return ret;
-	}
 
-	ret = 0;
 	for (actual = 0; actual < len; actual += chunk_len) {
 		chunk_len = min(len - actual, page_size - byte_addr);
 
@@ -195,7 +189,6 @@ static int spansion_write(struct spi_flash *flash,
 	      len, offset);
 #endif
 
-	spi_release_bus(flash->spi);
 	return ret;
 }
 
diff --git a/src/drivers/spi/spi_flash.c b/src/drivers/spi/spi_flash.c
index 099e1eb355..9d457ac528 100644
--- a/src/drivers/spi/spi_flash.c
+++ b/src/drivers/spi/spi_flash.c
@@ -46,6 +46,9 @@ static int do_spi_flash_cmd(struct spi_slave *spi, const void *dout,
 {
 	int ret = 1;
 
+	if (spi_claim_bus(spi))
+		return ret;
+
 #if CONFIG_SPI_ATOMIC_SEQUENCING == 1
 	if (spi_xfer(spi, dout, bytes_out, din, bytes_in) < 0)
 		goto done;
@@ -63,6 +66,7 @@ static int do_spi_flash_cmd(struct spi_slave *spi, const void *dout,
 
 	ret = 0;
 done:
+	spi_release_bus(spi);
 	return ret;
 }
 
@@ -111,9 +115,7 @@ int spi_flash_read_common(struct spi_flash *flash, const u8 *cmd,
 	int ret;
 
 	spi->rw = SPI_READ_FLAG;
-	spi_claim_bus(spi);
 	ret = spi_flash_cmd_read(spi, cmd, cmd_len, data, data_len);
-	spi_release_bus(spi);
 
 	return ret;
 }
@@ -191,11 +193,6 @@ int spi_flash_cmd_erase(struct spi_flash *flash, u8 erase_cmd,
 	}
 
 	flash->spi->rw = SPI_WRITE_FLAG;
-	ret = spi_claim_bus(flash->spi);
-	if (ret) {
-		printk(BIOS_WARNING, "SF: Unable to claim SPI bus\n");
-		return ret;
-	}
 
 	cmd[0] = erase_cmd;
 	start = offset;
@@ -225,7 +222,6 @@ int spi_flash_cmd_erase(struct spi_flash *flash, u8 erase_cmd,
 	printk(BIOS_DEBUG, "SF: Successfully erased %zu bytes @ %#x\n", len, start);
 
 out:
-	spi_release_bus(flash->spi);
 	return ret;
 }
 
@@ -301,11 +297,6 @@ struct spi_flash *spi_flash_probe(unsigned int bus, unsigned int cs)
 	}
 
 	spi->rw = SPI_READ_FLAG;
-	ret = spi_claim_bus(spi);
-	if (ret) {
-		printk(BIOS_WARNING, "SF: Failed to claim SPI bus: %d\n", ret);
-		goto err_claim_bus;
-	}
 
 	/* Read the ID codes */
 	ret = spi_flash_cmd(spi, CMD_READ_ID, idcode, sizeof(idcode));
@@ -354,13 +345,9 @@ struct spi_flash *spi_flash_probe(unsigned int bus, unsigned int cs)
 	printk(BIOS_INFO, "SF: Detected %s with page size %x, total %x\n",
 			flash->name, flash->sector_size, flash->size);
 
-	spi_release_bus(spi);
-
 	return flash;
 
 err_manufacturer_probe:
 err_read_id:
-	spi_release_bus(spi);
-err_claim_bus:
 	return NULL;
 }
diff --git a/src/drivers/spi/sst.c b/src/drivers/spi/sst.c
index 8cf3f964fd..a09f4e9c4e 100644
--- a/src/drivers/spi/sst.c
+++ b/src/drivers/spi/sst.c
@@ -150,15 +150,10 @@ static int
 sst_write(struct spi_flash *flash, u32 offset, size_t len, const void *buf)
 {
 	size_t actual, cmd_len;
-	int ret;
+	int ret = 0;
 	u8 cmd[4];
 
 	flash->spi->rw = SPI_WRITE_FLAG;
-	ret = spi_claim_bus(flash->spi);
-	if (ret) {
-		printk(BIOS_WARNING, "SF: Unable to claim SPI bus\n");
-		return ret;
-	}
 
 	/* If the data is not word aligned, write out leading single byte */
 	actual = offset % 2;
@@ -213,7 +208,6 @@ done:
 	printk(BIOS_SPEW, "SF: SST: program %s %zu bytes @ 0x%lx\n",
 	      ret ? "failure" : "success", len, (unsigned long)offset - actual);
 #endif
-	spi_release_bus(flash->spi);
 	return ret;
 }
 
diff --git a/src/drivers/spi/stmicro.c b/src/drivers/spi/stmicro.c
index 9aa31cf402..bc4d581e2f 100644
--- a/src/drivers/spi/stmicro.c
+++ b/src/drivers/spi/stmicro.c
@@ -141,7 +141,7 @@ static int stmicro_write(struct spi_flash *flash,
 	unsigned long page_size;
 	size_t chunk_len;
 	size_t actual;
-	int ret;
+	int ret = 0;
 	u8 cmd[4];
 
 	page_size = stm->params->page_size;
@@ -149,13 +149,7 @@ static int stmicro_write(struct spi_flash *flash,
 	byte_addr = offset % page_size;
 
 	flash->spi->rw = SPI_WRITE_FLAG;
-	ret = spi_claim_bus(flash->spi);
-	if (ret) {
-		printk(BIOS_WARNING, "SF: Unable to claim SPI bus\n");
-		return ret;
-	}
 
-	ret = 0;
 	for (actual = 0; actual < len; actual += chunk_len) {
 		chunk_len = min(len - actual, page_size - byte_addr);
 
@@ -196,7 +190,6 @@ static int stmicro_write(struct spi_flash *flash,
 	      len, offset);
 #endif
 
-	spi_release_bus(flash->spi);
 	return ret;
 }
 
diff --git a/src/drivers/spi/winbond.c b/src/drivers/spi/winbond.c
index 1ae0dba0f9..54bfca43c2 100644
--- a/src/drivers/spi/winbond.c
+++ b/src/drivers/spi/winbond.c
@@ -127,18 +127,13 @@ static int winbond_write(struct spi_flash *flash,
 	unsigned long page_size;
 	size_t chunk_len;
 	size_t actual;
-	int ret;
+	int ret = 0;
 	u8 cmd[4];
 
 	page_size = min(1 << stm->params->l2_page_size, CONTROLLER_PAGE_LIMIT);
 	byte_addr = offset % page_size;
 
 	flash->spi->rw = SPI_WRITE_FLAG;
-	ret = spi_claim_bus(flash->spi);
-	if (ret) {
-		printk(BIOS_WARNING, "SF: Unable to claim SPI bus\n");
-		return ret;
-	}
 
 	for (actual = 0; actual < len; actual += chunk_len) {
 		chunk_len = min(len - actual, page_size - byte_addr);
@@ -181,7 +176,6 @@ static int winbond_write(struct spi_flash *flash,
 	ret = 0;
 
 out:
-	spi_release_bus(flash->spi);
 	return ret;
 }