From a400554d4d2960edf16d40a4fcc8040b3e2f6d74 Mon Sep 17 00:00:00 2001 From: hailfinger Date: Sat, 19 Jul 2014 22:03:29 +0000 Subject: Rename programmer registration functions register_programmer suggests that we register a programmer. However, that function registers a master for a given bus type, and a programmer may support multiple masters (e.g. SPI, FWH). Rename a few other functions to be more consistent. Signed-off-by: Carl-Daniel Hailfinger Acked-by: Stefan Tauner git-svn-id: https://code.coreboot.org/svn/flashrom/trunk@1831 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- spi25.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'spi25.c') diff --git a/spi25.c b/spi25.c index 9763c80..673bdf5 100644 --- a/spi25.c +++ b/spi25.c @@ -172,7 +172,7 @@ int probe_spi_rdid4(struct flashctx *flash) /* Some SPI controllers do not support commands with writecnt=1 and * readcnt=4. */ - switch (flash->pgm->spi.type) { + switch (flash->mst->spi.type) { #if CONFIG_INTERNAL == 1 #if defined(__i386__) || defined(__x86_64__) case SPI_CONTROLLER_IT87XX: @@ -1079,7 +1079,7 @@ int default_spi_write_aai(struct flashctx *flash, const uint8_t *buf, unsigned i .readarr = NULL, }}; - switch (flash->pgm->spi.type) { + switch (flash->mst->spi.type) { #if CONFIG_INTERNAL == 1 #if defined(__i386__) || defined(__x86_64__) case SPI_CONTROLLER_IT87XX: -- cgit v1.2.1