From patchwork Fri Mar 22 13:25:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 13600097 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 A04D3C54E71 for ; Fri, 22 Mar 2024 13:27:06 +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=L/wSPXQiwxpiZ0EpWWtMpV031FyG7p4yRNe/LMPbNRo=; b=dKMk0w5YZqXPp5 LmIZKNQuxWHXUdAZWGknr0Z/eCjDvWSyiubavPf8mAG1jkDnOEJiqUrjTlJ9WJtSDEgvkmPv5gSnF AKyoiJP4zdQEclT7pXg/58tyznRDVDWXBKqKhrhaBjhN5F0AQOzZE49QRR45NMVjUB2m4xTIajiUS AHMujAUqPxASpyWU4qsIkdGqksIJGVL3Firqmc/HaDl/3wrgcwZslPMIVNS3iceDUJtCjbgrn1kFi D4Ljk3Y0pgC+pvhrXh72+fGxgP6HUVPKA1iMXq4bwWMjuEjeDk8ii15Q9fXL18PewQGIPNIvC2KG9 kQZ+wOlSRFqUx+TMln7w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rnev5-00000007I7m-1mTm; Fri, 22 Mar 2024 13:26:51 +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 1rneuw-00000007I1F-2LM6 for linux-arm-kernel@lists.infradead.org; Fri, 22 Mar 2024 13:26:44 +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=+9eJDPYcvheHFhVWSeTXcV93NuGaWmWAwekU/Oh9CJ4=; b=Vfk35M JSUL85oEwdUpaoZywSUhRxjNWZFf91x1byAkI9WKNyJM/QbM1VfS2Fxb6cb2IvHT 1/EXdQaz2aj2f0uLFipQE/ze0asri/1BS+RMssCl4QWqbgQ2Xoa2z1IuQcT7oEFx jDeYf1s2IZJm0VYbTrom+PO5KqjUsZMIYQEhFIQ2FlGgoQ//LRU9/8CgWVdfQ67w mRKX5szDSTQWxcLnn+m7bw0lgL75+Tt1gb10JGDFSy5jiygKviWP/zbmJyLWToBt 7f79pX+sQ0F0Hl139XavzX7SymVIaIUVHIyDTZ3uCmjboWaGdqNZjk5CfBZjy896 Zl7wVryR1CdTCnQg== Received: (qmail 3870202 invoked from network); 22 Mar 2024 14:26:26 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Mar 2024 14:26:26 +0100 X-UD-Smtp-Session: l3s3148p1@tj9VxT8UdJNehhtF From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Andi Shyti , Ray Jui , Scott Branden , Broadcom internal kernel review list , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 07/64] i2c: bcm-iproc: reword according to newest specification Date: Fri, 22 Mar 2024 14:25:00 +0100 Message-ID: <20240322132619.6389-8-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_062642_917049_DC0B7B4D X-CRM114-Status: GOOD ( 13.17 ) 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 Reviewed-by: Andi Shyti --- drivers/i2c/busses/i2c-bcm-iproc.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/i2c/busses/i2c-bcm-iproc.c b/drivers/i2c/busses/i2c-bcm-iproc.c index e905734c26a0..3c68d4df029f 100644 --- a/drivers/i2c/busses/i2c-bcm-iproc.c +++ b/drivers/i2c/busses/i2c-bcm-iproc.c @@ -224,8 +224,8 @@ static void slave_rx_tasklet_fn(unsigned long); | BIT(IS_S_TX_UNDERRUN_SHIFT) | BIT(IS_S_RX_FIFO_FULL_SHIFT)\ | BIT(IS_S_RX_THLD_SHIFT)) -static int bcm_iproc_i2c_reg_slave(struct i2c_client *slave); -static int bcm_iproc_i2c_unreg_slave(struct i2c_client *slave); +static int bcm_iproc_i2c_reg_target(struct i2c_client *slave); +static int bcm_iproc_i2c_unreg_target(struct i2c_client *slave); static void bcm_iproc_i2c_enable_disable(struct bcm_iproc_i2c_dev *iproc_i2c, bool enable); @@ -987,17 +987,17 @@ static uint32_t bcm_iproc_i2c_functionality(struct i2c_adapter *adap) val = I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL; - if (adap->algo->reg_slave) + if (adap->algo->reg_target) val |= I2C_FUNC_SLAVE; return val; } static struct i2c_algorithm bcm_iproc_algo = { - .master_xfer = bcm_iproc_i2c_xfer, + .xfer = bcm_iproc_i2c_xfer, .functionality = bcm_iproc_i2c_functionality, - .reg_slave = bcm_iproc_i2c_reg_slave, - .unreg_slave = bcm_iproc_i2c_unreg_slave, + .reg_target = bcm_iproc_i2c_reg_target, + .unreg_target = bcm_iproc_i2c_unreg_target, }; static const struct i2c_adapter_quirks bcm_iproc_i2c_quirks = { @@ -1079,8 +1079,8 @@ static int bcm_iproc_i2c_probe(struct platform_device *pdev) spin_lock_init(&iproc_i2c->idm_lock); /* no slave support */ - bcm_iproc_algo.reg_slave = NULL; - bcm_iproc_algo.unreg_slave = NULL; + bcm_iproc_algo.reg_target = NULL; + bcm_iproc_algo.unreg_target = NULL; } ret = bcm_iproc_i2c_init(iproc_i2c); @@ -1191,7 +1191,7 @@ static const struct dev_pm_ops bcm_iproc_i2c_pm_ops = { .resume_early = &bcm_iproc_i2c_resume }; -static int bcm_iproc_i2c_reg_slave(struct i2c_client *slave) +static int bcm_iproc_i2c_reg_target(struct i2c_client *slave) { struct bcm_iproc_i2c_dev *iproc_i2c = i2c_get_adapdata(slave->adapter); @@ -1210,7 +1210,7 @@ static int bcm_iproc_i2c_reg_slave(struct i2c_client *slave) return 0; } -static int bcm_iproc_i2c_unreg_slave(struct i2c_client *slave) +static int bcm_iproc_i2c_unreg_target(struct i2c_client *slave) { u32 tmp; struct bcm_iproc_i2c_dev *iproc_i2c = i2c_get_adapdata(slave->adapter);