From patchwork Wed Feb 7 18:40:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= X-Patchwork-Id: 198051 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:168b:b0:106:860b:bbdd with SMTP id ma11csp2436346dyb; Wed, 7 Feb 2024 10:51:20 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCXhcMJVdBvKgpXUaC/YnNej0I+V3l1LaryzV8R6tWNu3d5F4Uku9JnWmvypVf0HvybmkVgY3SxtOChUIO1Tt8OqRCKsbw== X-Google-Smtp-Source: AGHT+IEwTwFitZJNFH1La9nmjQed9gj1z4B1FFDsCcTdhGtNwgul5uNOuWdj0fpvXn8AnRebBoa+ X-Received: by 2002:a17:90b:38c3:b0:296:efee:f68 with SMTP id nn3-20020a17090b38c300b00296efee0f68mr1361608pjb.15.1707331880531; Wed, 07 Feb 2024 10:51:20 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707331880; cv=pass; d=google.com; s=arc-20160816; b=JbRfaHjKF/bJL/Mu5UBmWk0zmszoc2MLpbCX57dNeW8L9FYkYejIA3SsaeEV/46658 RV0ktXvg0+11bWnG4A0EA2V+Hp+ACfG3hbGvErZD43gadNApjc/DZ9sD5Xb6BF17dqxv LkuDkYJYvEX17PjhdCzy6CA/JS8UM+JpoME6EgdA7gRqSQxe9EY3RJ19cH6SELv06b5S 5bUgEiKS3ZzRUhcOBA1eVX51g3BkSkL5bE0kYgnGSsuARnSTKEd+65aBejzRivg4S26v EsmtM8l5waAlluwQXpZdHlm2NiNf67GuiPKhcZZT68lVnDFH7R1FXciNMtMPFOAD81FG 64NQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=vV+WHTZu+/ljRh6L/qM1rQZ7jFLa3iF9gx69Ofx7Myc=; fh=hD9LVQSFF6CsFIy0/KIGBDwG9IFlENtoFDVCkJCsyxQ=; b=ypuMTtVTHhrZiPQdyr4a11h9mSyE+kW6zh33SYSKeRecKtHVHcWwVLt9z8DyzJvo5V yq2nEt1RZfiB5AHJbORXr/eZrukF2oajgwf4aSjstPjKkE+R1qhA/yr4RREHV8DhsTNk r0WvcqH8L7CsOt8jP4zBVjDj0nTif2KuXFA5WyeTk+BlikipzBpwQ7dEUZHzVlN50m3v XCGrHTyNEd+guJ8vGfDdyxJ0D2oUlwdDaF0xUWcsaF79TP5WQj2rrBtE1ZUl8Z52ZBLE t+qjd3FD7+fmFjiOxv+X0DT9/7MjbM7ruWFv8ZQS0ZQ4cbuuuQnG9JJKrfnqVJNOzG5e U1OQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=pengutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-56941-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-56941-ouuuleilei=gmail.com@vger.kernel.org" X-Forwarded-Encrypted: i=2; AJvYcCV4YvWmGwIIuSjjBDb42wnjE0NLsTZtqIixlDCuo3U7+3IDIxlEyXPYGYBSwV+QB1D9BVKbENKCWvkK7QpszPYZHgTQrw== Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id o5-20020a17090ac70500b00296548b467bsi3987742pjt.1.2024.02.07.10.51.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Feb 2024 10:51:20 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-56941-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=pengutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-56941-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-56941-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 030B5284240 for ; Wed, 7 Feb 2024 18:50:21 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 9B0B71369BA; Wed, 7 Feb 2024 18:43:37 +0000 (UTC) Received: from metis.whiteo.stw.pengutronix.de (metis.whiteo.stw.pengutronix.de [185.203.201.7]) (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 655F1129A73 for ; Wed, 7 Feb 2024 18:43:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.203.201.7 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707331408; cv=none; b=s6CyPukmZsmjjyXy3reRphWHug37YTOpLd53s5lOBCalIRKv76j4R4XO75hFb+kOGj3akwwUiWhiOyMZl9DglUsNTNpHZRu1sQ1jAuBBsnzVL09B9/WehUQ8sYHY3X8n0ZOSo3gP6nqtKnDbgbUVWNrnbVIgw1exYPjKaxjAVEc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707331408; c=relaxed/simple; bh=uVMXV1VAwmhP57PkwJ+8EfziPZH/wl6a5rMlX05Ius0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=M5dpZqGjUY6jVHVE2MmVsWPD6W6lPI52a5poi8TRtjw0YfHcctXmx6LtWHAxhOve6Xr/ZEHjXmCCMwM4y6NMK1iuSFgdzetnIPMMNTGg2biDztX2Z14qhSs36dhJjrT4o/jSLjVQm1gaylt+G8eoD6dQw13FmvGsYPyv8CAkz80= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de; spf=pass smtp.mailfrom=pengutronix.de; arc=none smtp.client-ip=185.203.201.7 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pengutronix.de Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rXmtC-0007yo-Kk; Wed, 07 Feb 2024 19:43:18 +0100 Received: from [2a0a:edc0:0:900:1d::77] (helo=ptz.office.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1rXmtC-0054YS-0X; Wed, 07 Feb 2024 19:43:18 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rXmtB-00HRtZ-31; Wed, 07 Feb 2024 19:43:17 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Mark Brown Cc: kernel@pengutronix.de, Peter Huewe , Jarkko Sakkinen , Jason Gunthorpe , linux-integrity@vger.kernel.org, linux-kernel@vger.kernel.org, Jonathan Cameron Subject: [PATCH v3 26/32] tpm_tis_spi: Follow renaming of SPI "master" to "controller" Date: Wed, 7 Feb 2024 19:40:40 +0100 Message-ID: <29000c8fc0612974242e3c23d14dd4771b92c71e.1707324794.git.u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1354; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=uVMXV1VAwmhP57PkwJ+8EfziPZH/wl6a5rMlX05Ius0=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlw87QEEwTnOWMpiwjTY7gvENhprUqKM6u2t+pl EAyZ0X8+/qJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZcPO0AAKCRCPgPtYfRL+ TmnQCACF4kgbIRosnrHH0p+K1BjTaEvGGIQkvRZrdbR50l6niFbRyWV27GK+tVbI4aO3oQf7oBx t+AE2CbnmWxDfPAY64PH2qopJ3KDWOjYzMyaJrfPLhEWpP/5HuBBI3mLYKZ8FVqHEg9l2OoUFJB yg/C03oNmWZa+z47BEFZzJSynYGpdHaxWxwUt4yscetouY3hcCOGtW0YnPjwk1/lOyEnGL1wEBn 8VsR+71mu0vTR93PW+EUYFrYAfjCQy0yIVQ5bz43MhtUWl/bEn9uJoL9+oHs0gz53CTwFMMbUIv xi3yB6jv/x45yoAPN7UKtu7HJTgGg2grISAQNllBGWKJTLK2 X-Developer-Key: i=u.kleine-koenig@pengutronix.de; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: ukl@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790267234347626385 X-GMAIL-MSGID: 1790267234347626385 In commit 8caab75fd2c2 ("spi: Generalize SPI "master" to "controller"") some functions and struct members were renamed. To not break all drivers compatibility macros were provided. To be able to remove these compatibility macros push the renaming into this driver. Reviewed-by: Jarkko Sakkinen Acked-by: Jonathan Cameron Signed-off-by: Uwe Kleine-König --- drivers/char/tpm/tpm_tis_spi_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/char/tpm/tpm_tis_spi_main.c b/drivers/char/tpm/tpm_tis_spi_main.c index c5c3197ee29f..c647de7b3709 100644 --- a/drivers/char/tpm/tpm_tis_spi_main.c +++ b/drivers/char/tpm/tpm_tis_spi_main.c @@ -146,7 +146,7 @@ static int tpm_tis_spi_transfer_full(struct tpm_tis_data *data, u32 addr, struct spi_transfer spi_xfer; u8 transfer_len; - spi_bus_lock(phy->spi_device->master); + spi_bus_lock(phy->spi_device->controller); while (len) { transfer_len = min_t(u16, len, MAX_SPI_FRAMESIZE); @@ -210,7 +210,7 @@ static int tpm_tis_spi_transfer_full(struct tpm_tis_data *data, u32 addr, spi_sync_locked(phy->spi_device, &m); } - spi_bus_unlock(phy->spi_device->master); + spi_bus_unlock(phy->spi_device->controller); return ret; }