Change in flashrom[staging]: spi25: Fix layering violation in default_spi_write_aai()

[Nico Huber (Code Review)]

Nico Huber has uploaded a new change for review. ( https://review.coreboot.org/19419 )

Change subject: spi25: Fix layering violation in default_spi_write_aai()
......................................................................

spi25: Fix layering violation in default_spi_write_aai()

Change-Id: I8aa3e2992f64906edc669060936f9522d32637fb
Signed-off-by: Nico Huber 
---
M it87spi.c
M spi25.c
M wbsio_spi.c
3 files changed, 2 insertions(+), 16 deletions(-)

git pull ssh://review.coreboot.org:29418/flashrom refs/changes/19/19419/1

diff --git a/it87spi.c b/it87spi.c
index 0a1e894..c9e35dd 100644
--- a/it87spi.c
+++ b/it87spi.c
@@ -119,7 +119,7 @@
    .multicommand	= default_spi_send_multicommand,
    .read		= it8716f_spi_chip_read,
    .write_256	= it8716f_spi_chip_write_256,
-	.write_aai	= default_spi_write_aai,
+	.write_aai	= spi_chip_write_1,
 };

static uint16_t it87spi_probe(uint16_t port)
diff --git a/spi25.c b/spi25.c
index af4b6db..717e57d 100644
--- a/spi25.c
+++ b/spi25.c
@@ -1079,20 +1079,6 @@
    	.readarr	= NULL,
    }};

-	switch (flash->mst->spi.type) {
-#if CONFIG_INTERNAL == 1
-#if defined(__i386__) || defined(__x86_64__)
-	case SPI_CONTROLLER_IT87XX:
-	case SPI_CONTROLLER_WBSIO:
-		msg_perr("%s: impossible with this SPI controller,"
-				" degrading to byte program\n", __func__);
-		return spi_chip_write_1(flash, buf, start, len);
-#endif
-#endif
-	default:
-		break;
-	}
-
    /* The even start address and even length requirements can be either
     * honored outside this function, or we can call spi_byte_program
     * for the first and/or last byte and use AAI for the rest.
diff --git a/wbsio_spi.c b/wbsio_spi.c
index 0eeeb9b..d103152 100644
--- a/wbsio_spi.c
+++ b/wbsio_spi.c
@@ -76,7 +76,7 @@
    .multicommand = default_spi_send_multicommand,
    .read = wbsio_spi_read,
    .write_256 = spi_chip_write_1,
-	.write_aai = default_spi_write_aai,
+	.write_aai = spi_chip_write_1,
 };

int wbsio_check_for_spi(void)