From patchwork Fri Mar 22 13:25:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 13600103 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 26FF2C47DD9 for ; Fri, 22 Mar 2024 13:27:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=0/JfY7L1ba0S2YJMUC8AMcjdjVPGUn0P9lyoWrv5z+4=; b=LWSJKDTOgrhCKd mnAlyuh5y9MUh1CQEEjQXVugai3TMe2+Rim0Z7YEqapQMTZG9p2EozRQKMiUvULEJg5N2oqSw7HhB hG/78+ZXYPYk10FajZBvGL1yud/6dgsMy5vDhyc9iE5gij5rWitDH7bUzcdO+xANwBUahyw+sb3uX GUgRoWI3gNgPvPn0c0CjBfX6ru6YVJ3wAGBVCDaQFzfcFj/BzObLBCA0b4bLlvTsr4QpJZB9gI+HX ui/b6lI8Nj3wqr/AeShWbAw4l3fge2cgg1rk3uDERVrm/+baJ0z9CJ3YV2SMA5qExLShGAZCR1/7P 3q8yM64oEzs6FjRORHVw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rnevx-00000007IfU-16U5; Fri, 22 Mar 2024 13:27:45 +0000 Received: from www.zeus03.de ([194.117.254.33] helo=mail.zeus03.de) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rnevD-00000007IE3-1ury for linux-arm-kernel@lists.infradead.org; Fri, 22 Mar 2024 13:27:06 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= sang-engineering.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; s=k1; bh=vWbyFOf4V5PXU0iX7KbH4cd/yxRPi16DHsMc4aLJqy8=; b=dsjJPE hALiYPDPqtAFQ9EyzYechmRJCyKo2h6c35ksfOQrlgN1rmUEg4Y7fLngd2J9G9p+ Oz0qQTHVz4dyoVxysc3oIAd6aqrD8dQRVBORRlMCPZGEdR4jQ2LW/DqZfTAfoosv +biP1HBKQbD508GCkIiyb+YRG9E/PbE7lFGuIFBsw79gPg0F2oH+mWImZLKKIpzs 9MltKvpsXhxOhqVMhDQwY4xWK9SoMDk6X9kz/J5121N3QLsWaVz5j4ZSUuswAA9g V3CWKqHMUpyk6P94HcL5l5ldZJhTATEzYi8BfVlUOJHG53Mw+tVekPrFcBCnzfwW gbk3bi9HmsyGDb7A== Received: (qmail 3870775 invoked from network); 22 Mar 2024 14:26:42 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Mar 2024 14:26:42 +0100 X-UD-Smtp-Session: l3s3148p1@rQJJxj8UupRehhtF From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Dong Aisheng , Andi Shyti , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 26/64] i2c: imx-lpi2c: reword according to newest specification Date: Fri, 22 Mar 2024 14:25:19 +0100 Message-ID: <20240322132619.6389-27-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240322132619.6389-1-wsa+renesas@sang-engineering.com> References: <20240322132619.6389-1-wsa+renesas@sang-engineering.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240322_062700_097962_14C4D4D5 X-CRM114-Status: GOOD ( 12.59 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Match the wording of this driver wrt. the newest I2C v7, SMBus 3.2, I3C specifications and replace "master/slave" with more appropriate terms. They are also more specific because we distinguish now between a remote entity ("client") and a local one ("target"). Signed-off-by: Wolfram Sang --- drivers/i2c/busses/i2c-imx-lpi2c.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/i2c/busses/i2c-imx-lpi2c.c b/drivers/i2c/busses/i2c-imx-lpi2c.c index 6d72e4e126dd..337a55804463 100644 --- a/drivers/i2c/busses/i2c-imx-lpi2c.c +++ b/drivers/i2c/busses/i2c-imx-lpi2c.c @@ -262,7 +262,7 @@ static int lpi2c_imx_config(struct lpi2c_imx_struct *lpi2c_imx) return 0; } -static int lpi2c_imx_master_enable(struct lpi2c_imx_struct *lpi2c_imx) +static int lpi2c_imx_host_enable(struct lpi2c_imx_struct *lpi2c_imx) { unsigned int temp; int ret; @@ -292,7 +292,7 @@ static int lpi2c_imx_master_enable(struct lpi2c_imx_struct *lpi2c_imx) return ret; } -static int lpi2c_imx_master_disable(struct lpi2c_imx_struct *lpi2c_imx) +static int lpi2c_imx_host_disable(struct lpi2c_imx_struct *lpi2c_imx) { u32 temp; @@ -459,7 +459,7 @@ static int lpi2c_imx_xfer(struct i2c_adapter *adapter, unsigned int temp; int i, result; - result = lpi2c_imx_master_enable(lpi2c_imx); + result = lpi2c_imx_host_enable(lpi2c_imx); if (result) return result; @@ -502,7 +502,7 @@ static int lpi2c_imx_xfer(struct i2c_adapter *adapter, result = -EIO; disable: - lpi2c_imx_master_disable(lpi2c_imx); + lpi2c_imx_host_disable(lpi2c_imx); dev_dbg(&lpi2c_imx->adapter.dev, "<%s> exit with: %s: %d\n", __func__, (result < 0) ? "error" : "success msg", @@ -554,7 +554,7 @@ static u32 lpi2c_imx_func(struct i2c_adapter *adapter) } static const struct i2c_algorithm lpi2c_imx_algo = { - .master_xfer = lpi2c_imx_xfer, + .xfer = lpi2c_imx_xfer, .functionality = lpi2c_imx_func, };