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 --- dediprog.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'dediprog.c') diff --git a/dediprog.c b/dediprog.c index 358cac05..71a9f8bd 100644 --- a/dediprog.c +++ b/dediprog.c @@ -750,7 +750,7 @@ static int dediprog_setup(long target) return 0; } -static const struct spi_programmer spi_programmer_dediprog = { +static const struct spi_master spi_master_dediprog = { .type = SPI_CONTROLLER_DEDIPROG, .max_data_read = MAX_DATA_UNSPECIFIED, .max_data_write = MAX_DATA_UNSPECIFIED, @@ -929,7 +929,7 @@ int dediprog_init(void) return 1; } - register_spi_programmer(&spi_programmer_dediprog); + register_spi_master(&spi_master_dediprog); /* RE leftover, leave in until the driver is complete. */ #if 0 -- cgit v1.2.3