summaryrefslogtreecommitdiff
path: root/linux_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 /linux_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 'linux_spi.c')
-rw-r--r--linux_spi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/linux_spi.c b/linux_spi.c
index 695032c..2315c2a 100644
--- a/linux_spi.c
+++ b/linux_spi.c
@@ -46,7 +46,7 @@ static int linux_spi_read(struct flashctx *flash, uint8_t *buf,
static int linux_spi_write_256(struct flashctx *flash, const uint8_t *buf,
unsigned int start, unsigned int len);
-static const struct spi_programmer spi_programmer_linux = {
+static const struct spi_master spi_master_linux = {
.type = SPI_CONTROLLER_LINUX,
.max_data_read = MAX_DATA_UNSPECIFIED, /* TODO? */
.max_data_write = MAX_DATA_UNSPECIFIED, /* TODO? */
@@ -120,7 +120,7 @@ int linux_spi_init(void)
return 1;
}
- register_spi_programmer(&spi_programmer_linux);
+ register_spi_master(&spi_master_linux);
return 0;
}