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 --- it85spi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'it85spi.c') diff --git a/it85spi.c b/it85spi.c index 7efc680..1cc8730 100644 --- a/it85spi.c +++ b/it85spi.c @@ -279,7 +279,7 @@ static int it85xx_spi_send_command(struct flashctx *flash, const unsigned char *writearr, unsigned char *readarr); -static const struct spi_programmer spi_programmer_it85xx = { +static const struct spi_master spi_master_it85xx = { .type = SPI_CONTROLLER_IT85XX, .max_data_read = 64, .max_data_write = 64, @@ -315,7 +315,7 @@ int it85xx_spi_init(struct superio s) * a debug message about it. */ /* Set this as SPI controller. */ - register_spi_programmer(&spi_programmer_it85xx); + register_spi_master(&spi_master_it85xx); } return ret; } -- cgit v1.1