summaryrefslogtreecommitdiff
path: root/wbsio_spi.c
diff options
context:
space:
mode:
authorhailfinger <hailfinger@2b7e53f0-3cfb-0310-b3e9-8179ed1497e1>2014-07-19 22:03:29 +0000
committerhailfinger <hailfinger@2b7e53f0-3cfb-0310-b3e9-8179ed1497e1>2014-07-19 22:03:29 +0000
commita400554d4d2960edf16d40a4fcc8040b3e2f6d74 (patch)
tree5daecd880a16b7011be28e064fb7550f3e6b7e58 /wbsio_spi.c
parentd61c7437f8c0aa69836cab52f4416ffcc10a4047 (diff)
downloadflashrom-a400554d4d2960edf16d40a4fcc8040b3e2f6d74.tar.gz
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 <c-d.hailfinger.devel.2006@gmx.net> Acked-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at> git-svn-id: https://code.coreboot.org/svn/flashrom/trunk@1831 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'wbsio_spi.c')
-rw-r--r--wbsio_spi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/wbsio_spi.c b/wbsio_spi.c
index 7d4bb2a..0eeeb9b 100644
--- a/wbsio_spi.c
+++ b/wbsio_spi.c
@@ -68,7 +68,7 @@ static int wbsio_spi_send_command(struct flashctx *flash, unsigned int writecnt,
static int wbsio_spi_read(struct flashctx *flash, uint8_t *buf,
unsigned int start, unsigned int len);
-static const struct spi_programmer spi_programmer_wbsio = {
+static const struct spi_master spi_master_wbsio = {
.type = SPI_CONTROLLER_WBSIO,
.max_data_read = MAX_DATA_UNSPECIFIED,
.max_data_write = MAX_DATA_UNSPECIFIED,
@@ -90,7 +90,7 @@ int wbsio_check_for_spi(void)
msg_pdbg("%s: Winbond saved on 4 register bits so max chip size is "
"1024 kB!\n", __func__);
max_rom_decode.spi = 1024 * 1024;
- register_spi_programmer(&spi_programmer_wbsio);
+ register_spi_master(&spi_master_wbsio);
return 0;
}