From daa86b53012910428861330c8bf82ea3fe183796 Mon Sep 17 00:00:00 2001 From: Anastasia Klimchuk Date: Wed, 19 May 2021 13:35:59 +1000 Subject: stlinkv3_spi.c: Drop stlinkv3_ prefix for spi data struct member MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-on: https://review.coreboot.org/c/flashrom/+/54043 Tested-by: build bot (Jenkins) Reviewed-by: Edward O'Callaghan Reviewed-by: Miklós Márton --- stlinkv3_spi.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'stlinkv3_spi.c') diff --git a/stlinkv3_spi.c b/stlinkv3_spi.c index 5264d740..24531628 100644 --- a/stlinkv3_spi.c +++ b/stlinkv3_spi.c @@ -121,7 +121,7 @@ const struct dev_entry devs_stlinkv3_spi[] = { 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 @@ static int stlinkv3_spi_transmit(const struct flashctx *flash, 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 @@ static int stlinkv3_spi_shutdown(void *data) 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 @@ int stlinkv3_spi_init(void) } 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; -- cgit v1.2.3