From e2fc5e25f2d1cab86edac352d1a91f55c15c9f0a Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Wed, 17 May 2017 17:26:01 -0700 Subject: drivers/spi/spi_flash: Move flash ops to spi_flash_ops structure Define a new spi_flash_ops structure, move all spi flash operations to this structure and add a pointer to this structure in struct spi_flash. BUG=b:38330715 Change-Id: I550cc4556fc4b63ebc174a7e2fde42251fe56052 Signed-off-by: Furquan Shaikh Reviewed-on: https://review.coreboot.org/19757 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin --- src/drivers/spi/atmel.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'src/drivers/spi/atmel.c') diff --git a/src/drivers/spi/atmel.c b/src/drivers/spi/atmel.c index b97f255223..07bbf1686b 100644 --- a/src/drivers/spi/atmel.c +++ b/src/drivers/spi/atmel.c @@ -154,6 +154,16 @@ out: return ret; } +static const struct spi_flash_ops spi_flash_ops = { + .write = atmel_write, + .erase = spi_flash_cmd_erase, +#if IS_ENABLED(CONFIG_SPI_FLASH_NO_FAST_READ) + .read = spi_flash_cmd_read_slow, +#else + .read = spi_flash_cmd_read_fast, +#endif +}; + int spi_flash_probe_atmel(const struct spi_slave *spi, u8 *idcode, struct spi_flash *flash) { @@ -182,13 +192,7 @@ int spi_flash_probe_atmel(const struct spi_slave *spi, u8 *idcode, params->nr_blocks; flash->erase_cmd = CMD_AT25_SE; - flash->internal_write = atmel_write; - flash->internal_erase = spi_flash_cmd_erase; -#if CONFIG_SPI_FLASH_NO_FAST_READ - flash->internal_read = spi_flash_cmd_read_slow; -#else - flash->internal_read = spi_flash_cmd_read_fast; -#endif + flash->ops = &spi_flash_ops; return 0; } -- cgit v1.2.3