[PATCH v0 04/14] media: au0828: Make I2C terminology more inclusive
From: Easwar Hariharan <hidden>
Date: 2024-03-29 17:02:15
Also in:
amd-gfx, dri-devel, intel-gfx, intel-xe, linux-i2c, linux-media, lkml, nouveau
Subsystem:
media input infrastructure (v4l/dvb), the rest · Maintainers:
Mauro Carvalho Chehab, Linus Torvalds
I2C v7, SMBus 3.2, and I3C specifications have replaced "master/slave" with more appropriate terms. Inspired by and following on to Wolfram's series to fix drivers/i2c/[1], fix the terminology for users of I2C_ALGOBIT bitbanging interface, now that the approved verbiage exists in the specification. Compile tested, no functionality changes intended [1]: https://lore.kernel.org/all/20240322132619.6389-1-wsa+renesas@sang-engineering.com/ (local) Signed-off-by: Easwar Hariharan <redacted> --- drivers/media/usb/au0828/au0828-i2c.c | 4 ++-- drivers/media/usb/au0828/au0828-input.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/media/usb/au0828/au0828-i2c.c b/drivers/media/usb/au0828/au0828-i2c.c
index 749f90d73b5b..3e66d42bf134 100644
--- a/drivers/media/usb/au0828/au0828-i2c.c
+++ b/drivers/media/usb/au0828/au0828-i2c.c@@ -23,7 +23,7 @@ MODULE_PARM_DESC(i2c_scan, "scan i2c bus at insmod time"); #define I2C_WAIT_DELAY 25 #define I2C_WAIT_RETRY 1000 -static inline int i2c_slave_did_read_ack(struct i2c_adapter *i2c_adap) +static inline int i2c_client_did_read_ack(struct i2c_adapter *i2c_adap) { struct au0828_dev *dev = i2c_adap->algo_data; return au0828_read(dev, AU0828_I2C_STATUS_201) &
@@ -35,7 +35,7 @@ static int i2c_wait_read_ack(struct i2c_adapter *i2c_adap) int count; for (count = 0; count < I2C_WAIT_RETRY; count++) { - if (!i2c_slave_did_read_ack(i2c_adap)) + if (!i2c_client_did_read_ack(i2c_adap)) break; udelay(I2C_WAIT_DELAY); }
diff --git a/drivers/media/usb/au0828/au0828-input.c b/drivers/media/usb/au0828/au0828-input.c
index 3d3368202cd0..98a57b6e02e2 100644
--- a/drivers/media/usb/au0828/au0828-input.c
+++ b/drivers/media/usb/au0828/au0828-input.c@@ -30,7 +30,7 @@ struct au0828_rc { int polling; struct delayed_work work; - /* i2c slave address of external device (if used) */ + /* i2c client address of external device (if used) */ u16 i2c_dev_addr; int (*get_key_i2c)(struct au0828_rc *ir);
--
2.34.1