Edward O'Callaghan submitted this change.

View Change

Approvals: build bot (Jenkins): Verified Miklós Márton: Looks good to me, but someone else must approve Edward O'Callaghan: Looks good to me, approved
stlinkv3_spi.c: Drop stlinkv3_ prefix for spi data struct member

The name of the struct already contains stlinkv3_ prefix, so prefix
doesn't need to be repeated in members name.

BUG=b:185191942
TEST=builds

Change-Id: Ibddac9371ab8f08276d499642a9bdd6dbecea0ca
Signed-off-by: Anastasia Klimchuk <aklm@chromium.org>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/54043
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
Reviewed-by: Miklós Márton <martonmiklosqdev@gmail.com>
---
M stlinkv3_spi.c
1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/stlinkv3_spi.c b/stlinkv3_spi.c
index 5264d74..2453162 100644
--- a/stlinkv3_spi.c
+++ b/stlinkv3_spi.c
@@ -121,7 +121,7 @@

struct stlinkv3_spi_data {
struct libusb_context *usb_ctx;
- libusb_device_handle *stlinkv3_handle;
+ libusb_device_handle *handle;
};

static int stlinkv3_command(uint8_t *command, size_t command_length,
@@ -349,7 +349,7 @@
unsigned char *read_arr)
{
struct stlinkv3_spi_data *stlinkv3_data = flash->mst->spi.data;
- libusb_device_handle *stlinkv3_handle = stlinkv3_data->stlinkv3_handle;
+ libusb_device_handle *stlinkv3_handle = stlinkv3_data->handle;
uint8_t command[16];
int rc = 0;
int actual_length = 0;
@@ -464,9 +464,9 @@
stlinkv3_command(command, sizeof(command),
answer, sizeof(answer),
"STLINK_BRIDGE_CLOSE",
- stlinkv3_data->stlinkv3_handle);
+ stlinkv3_data->handle);

- libusb_close(stlinkv3_data->stlinkv3_handle);
+ libusb_close(stlinkv3_data->handle);
libusb_exit(stlinkv3_data->usb_ctx);

free(data);
@@ -543,7 +543,7 @@
}

stlinkv3_data->usb_ctx = usb_ctx;
- stlinkv3_data->stlinkv3_handle = stlinkv3_handle;
+ stlinkv3_data->handle = stlinkv3_handle;

if (register_shutdown(stlinkv3_spi_shutdown, stlinkv3_data))
goto init_err_cleanup_exit;

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

Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: Ibddac9371ab8f08276d499642a9bdd6dbecea0ca
Gerrit-Change-Number: 54043
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: Miklós Márton <martonmiklosqdev@gmail.com>
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