I2C v7, SMBus 3.2, and I3C 1.1.1 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+rene...@sang-engineering.com/ Signed-off-by: Easwar Hariharan <eahar...@linux.microsoft.com> --- drivers/media/pci/cx23885/cx23885-f300.c | 8 ++++---- drivers/media/pci/cx23885/cx23885-i2c.c | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/media/pci/cx23885/cx23885-f300.c b/drivers/media/pci/cx23885/cx23885-f300.c index ac1c434e8e24..5f937c281793 100644 --- a/drivers/media/pci/cx23885/cx23885-f300.c +++ b/drivers/media/pci/cx23885/cx23885-f300.c @@ -92,7 +92,7 @@ static u8 f300_xfer(struct dvb_frontend *fe, u8 *buf) f300_set_line(dev, F300_RESET, 0);/* begin to send data */ msleep(1); - f300_send_byte(dev, 0xe0);/* the slave address is 0xe0, write */ + f300_send_byte(dev, 0xe0);/* the client address is 0xe0, write */ msleep(1); temp = buf[0]; @@ -112,10 +112,10 @@ static u8 f300_xfer(struct dvb_frontend *fe, u8 *buf) } if (i > 7) { - pr_err("%s: timeout, the slave no response\n", + pr_err("%s: timeout, the client no response\n", __func__); - ret = 1; /* timeout, the slave no response */ - } else { /* the slave not busy, prepare for getting data */ + ret = 1; /* timeout, the client no response */ + } else { /* the client not busy, prepare for getting data */ f300_set_line(dev, F300_RESET, 0);/*ready...*/ msleep(1); f300_send_byte(dev, 0xe1);/* 0xe1 is Read */ diff --git a/drivers/media/pci/cx23885/cx23885-i2c.c b/drivers/media/pci/cx23885/cx23885-i2c.c index f51fad33dc04..385af2a893b4 100644 --- a/drivers/media/pci/cx23885/cx23885-i2c.c +++ b/drivers/media/pci/cx23885/cx23885-i2c.c @@ -34,7 +34,7 @@ MODULE_PARM_DESC(i2c_scan, "scan i2c bus at insmod time"); #define I2C_EXTEND (1 << 3) #define I2C_NOSTOP (1 << 4) -static inline int i2c_slave_did_ack(struct i2c_adapter *i2c_adap) +static inline int i2c_client_did_ack(struct i2c_adapter *i2c_adap) { struct cx23885_i2c *bus = i2c_adap->algo_data; struct cx23885_dev *dev = bus->dev; @@ -84,7 +84,7 @@ static int i2c_sendbytes(struct i2c_adapter *i2c_adap, cx_write(bus->reg_ctrl, bus->i2c_period | (1 << 2)); if (!i2c_wait_done(i2c_adap)) return -EIO; - if (!i2c_slave_did_ack(i2c_adap)) + if (!i2c_client_did_ack(i2c_adap)) return -ENXIO; dprintk(1, "%s() returns 0\n", __func__); @@ -163,7 +163,7 @@ static int i2c_readbytes(struct i2c_adapter *i2c_adap, cx_write(bus->reg_ctrl, bus->i2c_period | (1 << 2) | 1); if (!i2c_wait_done(i2c_adap)) return -EIO; - if (!i2c_slave_did_ack(i2c_adap)) + if (!i2c_client_did_ack(i2c_adap)) return -ENXIO; -- 2.34.1
