From: Easwar Hariharan <eahariha@linux.microsoft.com>
To: Mauro Carvalho Chehab <mchehab@kernel.org>,
Easwar Hariharan <eahariha@linux.microsoft.com>,
linux-media@vger.kernel.org (open list:MEDIA INPUT
INFRASTRUCTURE (V4L/DVB)),
linux-kernel@vger.kernel.org (open list)
Cc: Wolfram Sang <wsa+renesas@sang-engineering.com>,
amd-gfx@lists.freedesktop.org (open list:RADEON and AMDGPU DRM
DRIVERS), dri-devel@lists.freedesktop.org (open list:DRM DRIVERS),
linux-kernel@vger.kernel.org (open list),
intel-gfx@lists.freedesktop.org (open list:INTEL DRM DISPLAY FOR
XE AND I915 DRIVERS),
intel-xe@lists.freedesktop.org (open list:INTEL DRM DISPLAY FOR
XE AND I915 DRIVERS),
nouveau@lists.freedesktop.org (open list:DRM DRIVER FOR NVIDIA
GEFORCE/QUADRO GPUS),
linux-i2c@vger.kernel.org (open list:I2C SUBSYSTEM HOST DRIVERS),
linux-media@vger.kernel.org (open list:BTTV VIDEO4LINUX DRIVER),
linux-fbdev@vger.kernel.org (open list:FRAMEBUFFER LAYER)
Subject: [PATCH v1 09/12] media: cx23885: Make I2C terminology more inclusive
Date: Tue, 30 Apr 2024 17:38:08 +0000 [thread overview]
Message-ID: <20240430173812.1423757-10-eahariha@linux.microsoft.com> (raw)
In-Reply-To: <20240430173812.1423757-1-eahariha@linux.microsoft.com>
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+renesas@sang-engineering.com/
Signed-off-by: Easwar Hariharan <eahariha@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
next prev parent reply other threads:[~2024-04-30 17:39 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-30 17:37 [PATCH v1 00/12] Make I2C terminology more inclusive for I2C Algobit and consumers Easwar Hariharan
2024-04-30 17:38 ` [PATCH v1 01/12] drm/amdgpu, drm/radeon: Make I2C terminology more inclusive Easwar Hariharan
2024-04-30 17:38 ` [PATCH v1 02/12] drm/gma500: " Easwar Hariharan
2024-05-02 10:45 ` Thomas Zimmermann
2024-04-30 17:38 ` [PATCH v1 03/12] drm/i915: " Easwar Hariharan
2024-04-30 20:29 ` Rodrigo Vivi
2024-04-30 21:40 ` Easwar Hariharan
2024-05-03 7:23 ` Zhi Wang
2024-04-30 17:38 ` [PATCH v1 04/12] media: au0828: " Easwar Hariharan
2024-04-30 17:38 ` [PATCH v1 05/12] media: cobalt: " Easwar Hariharan
2024-04-30 17:38 ` [PATCH v1 06/12] media: cx18: " Easwar Hariharan
2024-04-30 17:38 ` [PATCH v1 07/12] media: cx25821: " Easwar Hariharan
2024-04-30 17:38 ` [PATCH v1 08/12] media: ivtv: " Easwar Hariharan
2024-04-30 17:38 ` Easwar Hariharan [this message]
2024-04-30 17:38 ` [PATCH v1 10/12] sfc: falcon: " Easwar Hariharan
2024-05-03 22:13 ` Jakub Kicinski
2024-05-06 15:54 ` Easwar Hariharan
2024-04-30 17:38 ` [PATCH v1 11/12] fbdev/smscufx: " Easwar Hariharan
2024-05-02 10:45 ` Thomas Zimmermann
2024-04-30 17:38 ` [PATCH v1 12/12] fbdev/viafb: " Easwar Hariharan
2024-05-02 10:46 ` Thomas Zimmermann
2024-05-02 22:26 ` Easwar Hariharan
2024-05-03 7:39 ` Thomas Zimmermann
2024-05-03 16:48 ` Easwar Hariharan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240430173812.1423757-10-eahariha@linux.microsoft.com \
--to=eahariha@linux.microsoft.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=intel-xe@lists.freedesktop.org \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=nouveau@lists.freedesktop.org \
--cc=wsa+renesas@sang-engineering.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).