From patchwork Sat Jul 6 11:20:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 811290 Received: from mail.zeus03.de (zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 66F9915F314 for ; Sat, 6 Jul 2024 11:22:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720264929; cv=none; b=fdHt7YX9/J8SL0IgRhL314Un4MvmIBsMZ8JQwgpUo/9IjvymnGKAVlNHiJFGDHgR3m0CfzZBRiG/Zi7z19MpoFfVh32TH9fHT+bnjwHLCtsL0dX4t6dCLIk54Go4GIkW4e9XF3Vdu5XbTnKhR3e/Aj17j7zuKq46m5iSsXGfHhk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720264929; c=relaxed/simple; bh=7dg6OjUul6CGYPKqeHT59FN/DW+jNVzMTYuArvmRep4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DBbYlF9nHh1MEPLeoSErFwwVD2EuFDVIVs8b6ujOvT6Gi5YaWBKMYB/QnykDZd3xNYXLV/qF9kH4dknAnog+8/2By4rKHJgy2ZBTiB4QpAoBgUSxAaIZqgwNnELHoabEL1iNaHG1A1HWOBbD8w5pWXwtqN4StR/jyoBWDOM7Q2E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=l+5qkZV3; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="l+5qkZV3" 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=O+DQTIwXTC7DeV38nbA6p6oVvBJeZ5V9St2bzhvReOQ=; b=l+5qkZ V3hn1i5UCfgjdB/NMxnOMIKXwUsVOIau3NOx8SApuMhduvNDuw37LT0NqZ02RHl2 vy3HMrXqH+CNR+3vIkVQNK1u4RGuP72WXcHEa2aMV1AZqybnD+KkpTCeksrtsmRj i8oM6udJNXh/lbhz5xzhn6ddSGlSgewcL2F31B4c6ska0kVEWJcOYP7ewKih2/Om cuUiW0JCEB2ZSZyXAyP0PK70A6J8PGZ0hoqdJv9PATkfWbeUioxwTpwvv9ybtMBC aYv4rCwDrgDpnC7z2VHVRp0p0xc2LL29FEp5sENOVjBkoFia//g53qTY5oN8xfpq FY56Ka29EaWThRow== Received: (qmail 3810632 invoked from network); 6 Jul 2024 13:21:49 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 6 Jul 2024 13:21:49 +0200 X-UD-Smtp-Session: l3s3148p1@LindYpIcMMJQT+F6 From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , Andi Shyti , Michael Ellerman , Nicholas Piggin , Christophe Leroy , "Naveen N. Rao" , linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 39/60] i2c: powermac: reword according to newest specification Date: Sat, 6 Jul 2024 13:20:39 +0200 Message-ID: <20240706112116.24543-40-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240706112116.24543-1-wsa+renesas@sang-engineering.com> References: <20240706112116.24543-1-wsa+renesas@sang-engineering.com> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Change the wording of this driver wrt. the newest I2C v7 and SMBus 3.2 specifications and replace "master/slave" with more appropriate terms. Signed-off-by: Wolfram Sang --- drivers/i2c/busses/i2c-powermac.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/i2c/busses/i2c-powermac.c b/drivers/i2c/busses/i2c-powermac.c index 8e57ebe595be..b6b03539f626 100644 --- a/drivers/i2c/busses/i2c-powermac.c +++ b/drivers/i2c/busses/i2c-powermac.c @@ -127,13 +127,13 @@ static s32 i2c_powermac_smbus_xfer( struct i2c_adapter* adap, } /* - * Generic i2c master transfer entrypoint. This driver only support single + * Generic i2c transfer entrypoint. This driver only supports single * messages (for "lame i2c" transfers). Anything else should use the smbus * entry point */ -static int i2c_powermac_master_xfer( struct i2c_adapter *adap, - struct i2c_msg *msgs, - int num) +static int i2c_powermac_xfer(struct i2c_adapter *adap, + struct i2c_msg *msgs, + int num) { struct pmac_i2c_bus *bus = i2c_get_adapdata(adap); int rc = 0; @@ -179,9 +179,9 @@ static u32 i2c_powermac_func(struct i2c_adapter * adapter) /* For now, we only handle smbus */ static const struct i2c_algorithm i2c_powermac_algorithm = { - .smbus_xfer = i2c_powermac_smbus_xfer, - .master_xfer = i2c_powermac_master_xfer, - .functionality = i2c_powermac_func, + .smbus_xfer = i2c_powermac_smbus_xfer, + .xfer = i2c_powermac_xfer, + .functionality = i2c_powermac_func, }; static const struct i2c_adapter_quirks i2c_powermac_quirks = {