From 9055ef95d33993252a4f982940961a2984e5cee9 Mon Sep 17 00:00:00 2001 From: Anastasia Klimchuk Date: Wed, 26 May 2021 08:48:24 +1000 Subject: bitbang_spi.c: Rename usages of bitbang_spi_master into master There were two different things in this file, but both of them were called "mst" and it was confusing. Now the variables of type bitbang_spi_master are called "master", including the member of bitbang_spi_master_data. The variables of type spi_master are called mst. BUG=b:185191942 TEST=builds Change-Id: I2fdbdc2daedde7f6996642cfbb2d34ec06a89621 Signed-off-by: Anastasia Klimchuk Reviewed-on: https://review.coreboot.org/c/flashrom/+/54989 Tested-by: build bot (Jenkins) Reviewed-by: Edward O'Callaghan --- bitbang_spi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bitbang_spi.c b/bitbang_spi.c index bb89071d..85c867ee 100644 --- a/bitbang_spi.c +++ b/bitbang_spi.c @@ -95,7 +95,7 @@ static void bitbang_spi_write_byte(const struct bitbang_spi_master *master, uint } struct bitbang_spi_master_data { - const struct bitbang_spi_master *mst; + const struct bitbang_spi_master *master; }; static int bitbang_spi_send_command(const struct flashctx *flash, @@ -105,7 +105,7 @@ static int bitbang_spi_send_command(const struct flashctx *flash, { unsigned int i; const struct bitbang_spi_master_data *data = flash->mst->spi.data; - const struct bitbang_spi_master *master = data->mst; + const struct bitbang_spi_master *master = data->master; /* FIXME: Run bitbang_spi_request_bus here or in programmer init? * Requesting and releasing the SPI bus is handled in here to allow the @@ -160,7 +160,7 @@ int register_spi_bitbang_master(const struct bitbang_spi_master *master) } struct bitbang_spi_master_data *data = calloc(1, sizeof(struct bitbang_spi_master_data)); - data->mst = master; + data->master = master; mst.data = data; register_spi_master(&mst, NULL); register_shutdown(bitbang_spi_shutdown, data); -- cgit v1.2.3