Edward O'Callaghan submitted this change.

View Change

Approvals: build bot (Jenkins): Verified Edward O'Callaghan: Looks good to me, approved
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 <aklm@chromium.org>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/54989
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
---
M bitbang_spi.c
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bitbang_spi.c b/bitbang_spi.c
index bb89071..85c867e 100644
--- a/bitbang_spi.c
+++ b/bitbang_spi.c
@@ -95,7 +95,7 @@
}

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 @@
{
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 @@
}

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);

To view, visit change 54989. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: I2fdbdc2daedde7f6996642cfbb2d34ec06a89621
Gerrit-Change-Number: 54989
Gerrit-PatchSet: 3
Gerrit-Owner: Anastasia Klimchuk <aklm@chromium.org>
Gerrit-Reviewer: Angel Pons <th3fanbus@gmail.com>
Gerrit-Reviewer: Edward O'Callaghan <quasisec@chromium.org>
Gerrit-Reviewer: Nico Huber <nico.h@gmx.de>
Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org>
Gerrit-CC: Paul Menzel <paulepanter@mailbox.org>
Gerrit-MessageType: merged