drivers/spi/spi_flash: Pass in flash structure to fill in probe

Instead of making all SPI drivers allocate space for a spi_flash
structure and fill it in, udpate the API to allow callers to pass in a
spi_flash structure that can be filled by the flash drivers as
required. This also cleans up the interface so that the callers can
maintain and free the space for spi_flash structure as required.

BUG=b:38330715

Change-Id: If6f1b403731466525c4690777d9b32ce778eb563
Signed-off-by: Furquan Shaikh <furquan@chromium.org>
Reviewed-on: https://review.coreboot.org/19705
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>

1 files changed, 4 insertions, 10 deletions

diff --git a/src/drivers/spi/amic.c b/src/drivers/spi/amic.c
index 60843608f5..cf5a29601d 100644
--- a/src/drivers/spi/amic.c
+++ b/src/drivers/spi/amic.c
@@ -109,11 +109,11 @@ out:
 	return ret;
 }
 
-struct spi_flash *spi_flash_probe_amic(struct spi_slave *spi, u8 *idcode)
+int spi_flash_probe_amic(struct spi_slave *spi, u8 *idcode,
+			 struct spi_flash *flash)
 {
 	const struct amic_spi_flash_params *params;
 	unsigned int i;
-	struct spi_flash *flash;
 
 	for (i = 0; i < ARRAY_SIZE(amic_spi_flash_table); i++) {
 		params = &amic_spi_flash_table[i];
@@ -124,13 +124,7 @@ struct spi_flash *spi_flash_probe_amic(struct spi_slave *spi, u8 *idcode)
 	if (i == ARRAY_SIZE(amic_spi_flash_table)) {
 		printk(BIOS_WARNING, "SF: Unsupported AMIC ID %02x%02x\n",
 				idcode[1], idcode[2]);
-		return NULL;
-	}
-
-	flash = malloc(sizeof(*flash));
-	if (!flash) {
-		printk(BIOS_WARNING, "SF: Failed to allocate memory\n");
-		return NULL;
+		return -1;
 	}
 
 	memcpy(&flash->spi, spi, sizeof(*spi));
@@ -151,5 +145,5 @@ struct spi_flash *spi_flash_probe_amic(struct spi_slave *spi, u8 *idcode)
 	flash->internal_read = spi_flash_cmd_read_fast;
 #endif
 
-	return flash;
+	return 0;
 }