From a5bcbceb581f27cfc0055369d3dd9cfd1ae00bfa Mon Sep 17 00:00:00 2001 From: Carl-Daniel 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. Corresponding to flashrom svn r1831. Signed-off-by: Carl-Daniel Hailfinger Acked-by: Stefan Tauner --- it87spi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'it87spi.c') diff --git a/it87spi.c b/it87spi.c index 160c4b6..0a1e894 100644 --- a/it87spi.c +++ b/it87spi.c @@ -111,7 +111,7 @@ static int it8716f_spi_chip_read(struct flashctx *flash, uint8_t *buf, static int it8716f_spi_chip_write_256(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); -static const struct spi_programmer spi_programmer_it87xx = { +static const struct spi_master spi_master_it87xx = { .type = SPI_CONTROLLER_IT87XX, .max_data_read = MAX_DATA_UNSPECIFIED, .max_data_write = MAX_DATA_UNSPECIFIED, @@ -228,7 +228,7 @@ static uint16_t it87spi_probe(uint16_t port) if (internal_buses_supported & BUS_SPI) msg_pdbg("Overriding chipset SPI with IT87 SPI.\n"); /* FIXME: Add the SPI bus or replace the other buses with it? */ - register_spi_programmer(&spi_programmer_it87xx); + register_spi_master(&spi_master_it87xx); return 0; } -- cgit v1.1