diff options
| author | Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> | 2014-07-19 22:03:29 +0000 |
|---|---|---|
| committer | Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> | 2014-07-19 22:03:29 +0000 |
| commit | a5bcbceb581f27cfc0055369d3dd9cfd1ae00bfa (patch) | |
| tree | 5daecd880a16b7011be28e064fb7550f3e6b7e58 /linux_spi.c | |
| parent | 82b6ec1df30d3fca55547f230c76718d6e613b2a (diff) | |
| download | flashrom-git-a5bcbceb581f27cfc0055369d3dd9cfd1ae00bfa.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.
Corresponding to flashrom svn r1831.
Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
Diffstat (limited to 'linux_spi.c')
| -rw-r--r-- | linux_spi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux_spi.c b/linux_spi.c index 695032ca..2315c2ab 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; } |