From 36757c3effc802ee01956299ecced60d2ed5ff3f Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Fri, 24 Sep 2021 20:04:50 +0100 Subject: [PATCH] trivial: Remove some instances of 'slave' that crept in --- plugins/parade-lspcon/fu-parade-lspcon-device.c | 2 +- plugins/vli/fu-vli-usbhub-rtd21xx-device.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/parade-lspcon/fu-parade-lspcon-device.c b/plugins/parade-lspcon/fu-parade-lspcon-device.c index d108d2021..abfbce2a4 100644 --- a/plugins/parade-lspcon/fu-parade-lspcon-device.c +++ b/plugins/parade-lspcon/fu-parade-lspcon-device.c @@ -164,7 +164,7 @@ fu_parade_lspcon_ensure_i2c_address(FuParadeLspconDevice *self, guint8 address, (guint8 *)(guintptr)address, NULL, error)) { - g_prefix_error(error, "failed to set I2C slave address: "); + g_prefix_error(error, "failed to set I2C address: "); return FALSE; } return TRUE; diff --git a/plugins/vli/fu-vli-usbhub-rtd21xx-device.c b/plugins/vli/fu-vli-usbhub-rtd21xx-device.c index 324d9cfee..437495330 100644 --- a/plugins/vli/fu-vli-usbhub-rtd21xx-device.c +++ b/plugins/vli/fu-vli-usbhub-rtd21xx-device.c @@ -50,7 +50,7 @@ typedef enum { static gboolean fu_vli_usbhub_device_i2c_write(FuVliUsbhubDevice *self, - guint8 slave_addr, + guint8 target_addr, guint8 sub_addr, guint8 *data, gsize datasz, @@ -60,7 +60,7 @@ fu_vli_usbhub_device_i2c_write(FuVliUsbhubDevice *self, gsize bufsz = datasz + 2; g_autofree guint8 *buf = g_malloc0(bufsz); - buf[0] = slave_addr; + buf[0] = target_addr; buf[1] = sub_addr; if (!fu_memcpy_safe(buf, bufsz, @@ -86,7 +86,7 @@ fu_vli_usbhub_device_i2c_write(FuVliUsbhubDevice *self, FU_VLI_DEVICE_TIMEOUT, NULL, error)) { - g_prefix_error(error, "failed to write I2C @0x%02x:%02x: ", slave_addr, sub_addr); + g_prefix_error(error, "failed to write I2C @0x%02x:%02x: ", target_addr, sub_addr); return FALSE; } g_usleep(I2C_DELAY_AFTER_SEND); @@ -95,7 +95,7 @@ fu_vli_usbhub_device_i2c_write(FuVliUsbhubDevice *self, static gboolean fu_vli_usbhub_device_i2c_read(FuVliUsbhubDevice *self, - guint8 slave_addr, + guint8 target_addr, guint8 sub_addr, guint8 *data, gsize datasz, @@ -108,7 +108,7 @@ fu_vli_usbhub_device_i2c_read(FuVliUsbhubDevice *self, G_USB_DEVICE_RECIPIENT_DEVICE, I2C_READ_REQUEST, 0x0000, - ((guint16)sub_addr << 8) + slave_addr, + ((guint16)sub_addr << 8) + target_addr, data, datasz, NULL,