From patchwork Tue Apr 30 17:38:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Easwar Hariharan X-Patchwork-Id: 793507 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by smtp.subspace.kernel.org (Postfix) with ESMTP id E6DFE199E99; Tue, 30 Apr 2024 17:39:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=13.77.154.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714498787; cv=none; b=cx7jXKdGEswddB+AB43xJWQsvXKh/tQ5kaaO/SWWIEB4P9FKANvogfzcRwJDXW8Bj9QdeGpKjHx8VWgGEKLhToxxSeGj3s9dQbTgaJYoqg9v2Lr67T+/1ToJ8hMNsv6zTGLZLYr9X9R+WTPto6LINZsl7Y5vlZ/SYl3RdqXA8fk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714498787; c=relaxed/simple; bh=GiaLBHeyxCK6vqA9oXnDuA/09cUAcHbpc5COM0sVPeg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=cT0HxjldVV5ug/3zrP5V06hl3fI8flELgtUtKwTka4bF+69I9aLDB+JyozfzsRRKR4S770Kp32V5LPDwgFVZqGIuSXJ6Czx5tvJOQF8rjEX+qs/8/h92XOwAJqKpvtbXzuJoUrr0WfQWwhi8/EhsdPYzJ0vhII+O/Bbja6KSSyM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.microsoft.com; spf=pass smtp.mailfrom=linux.microsoft.com; dkim=pass (1024-bit key) header.d=linux.microsoft.com header.i=@linux.microsoft.com header.b=Xzl8Y7dK; arc=none smtp.client-ip=13.77.154.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.microsoft.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.microsoft.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.microsoft.com header.i=@linux.microsoft.com header.b="Xzl8Y7dK" Received: from rrs24-12-35.corp.microsoft.com (unknown [131.107.174.176]) by linux.microsoft.com (Postfix) with ESMTPSA id 8951F210FBDF; Tue, 30 Apr 2024 10:39:45 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 8951F210FBDF DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1714498785; bh=rcfYVAHkQOpTrlPgYUDecaSeekpFDvLxrEvRZ7jqaLk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Xzl8Y7dK47MOxC0E5yakG9wZYswUHKm9iclFS4TWptvzP8V/hSQ478M2JjtrvO/LM 2vvbpjKdLoE5UDV1jdCIUrCfjaorcW3jEyQezp11dI1otbOLQETU0suZKaTfiZ6/fX i6tJ2dim6XGpDIPE9PHcYhnztyKYE7B7NtNUJhSE= From: Easwar Hariharan To: Mauro Carvalho Chehab , Easwar Hariharan , linux-media@vger.kernel.org (open list:MEDIA INPUT INFRASTRUCTURE (V4L/DVB)), linux-kernel@vger.kernel.org (open list) Cc: Wolfram Sang , 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 07/12] media: cx25821: Make I2C terminology more inclusive Date: Tue, 30 Apr 2024 17:38:06 +0000 Message-Id: <20240430173812.1423757-8-eahariha@linux.microsoft.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240430173812.1423757-1-eahariha@linux.microsoft.com> References: <20240430173812.1423757-1-eahariha@linux.microsoft.com> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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 --- drivers/media/pci/cx25821/cx25821-i2c.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/media/pci/cx25821/cx25821-i2c.c b/drivers/media/pci/cx25821/cx25821-i2c.c index 0ef4cd6528a0..bad8fb9f5319 100644 --- a/drivers/media/pci/cx25821/cx25821-i2c.c +++ b/drivers/media/pci/cx25821/cx25821-i2c.c @@ -33,7 +33,7 @@ do { \ #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 cx25821_i2c *bus = i2c_adap->algo_data; struct cx25821_dev *dev = bus->dev; @@ -85,7 +85,7 @@ static int i2c_sendbytes(struct i2c_adapter *i2c_adap, if (!i2c_wait_done(i2c_adap)) return -EIO; - if (!i2c_slave_did_ack(i2c_adap)) + if (!i2c_client_did_ack(i2c_adap)) return -EIO; dprintk(1, "%s(): returns 0\n", __func__); @@ -174,7 +174,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 -EIO; dprintk(1, "%s(): returns 0\n", __func__);