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/spansion.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src/drivers/spi/spansion.c') diff --git a/src/drivers/spi/spansion.c b/src/drivers/spi/spansion.c index de7ad55a34..cb528d3916 100644 --- a/src/drivers/spi/spansion.c +++ b/src/drivers/spi/spansion.c @@ -246,6 +246,13 @@ static int spansion_write(const struct spi_flash *flash, u32 offset, size_t len, return ret; } +static const struct spi_flash_ops spi_flash_ops = { + .write = spansion_write, + .erase = spi_flash_cmd_erase, + .read = spi_flash_cmd_read_slow, + .status = spi_flash_cmd_status, +}; + int spi_flash_probe_spansion(const struct spi_slave *spi, u8 *idcode, struct spi_flash *flash) { @@ -273,10 +280,7 @@ int spi_flash_probe_spansion(const struct spi_slave *spi, u8 *idcode, flash->erase_cmd = CMD_S25FLXX_SE; flash->status_cmd = CMD_S25FLXX_RDSR; - flash->internal_write = spansion_write; - flash->internal_erase = spi_flash_cmd_erase; - flash->internal_read = spi_flash_cmd_read_slow; - flash->internal_status = spi_flash_cmd_status; + flash->ops = &spi_flash_ops; return 0; } -- cgit v1.2.3