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 --- ft2232_spi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ft2232_spi.c') diff --git a/ft2232_spi.c b/ft2232_spi.c index e87d5edff..f74deb4f9 100644 --- a/ft2232_spi.c +++ b/ft2232_spi.c @@ -146,7 +146,7 @@ static int ft2232_spi_send_command(struct flashctx *flash, const unsigned char *writearr, unsigned char *readarr); -static const struct spi_programmer spi_programmer_ft2232 = { +static const struct spi_master spi_master_ft2232 = { .type = SPI_CONTROLLER_FT2232, .max_data_read = 64 * 1024, .max_data_write = 256, @@ -389,7 +389,7 @@ int ft2232_spi_init(void) goto ftdi_err; } - register_spi_programmer(&spi_programmer_ft2232); + register_spi_master(&spi_master_ft2232); return 0; -- cgit v1.2.3