From patchwork Wed Feb 7 18:40:29 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: 198045 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:168b:b0:106:860b:bbdd with SMTP id ma11csp2434717dyb; Wed, 7 Feb 2024 10:47:55 -0800 (PST) X-Google-Smtp-Source: AGHT+IFaKNwPu1MYQ/BzCuwcXJutYoJ6C0aQejJD5CN5V5PZqHgL6EKA0v0fI5ahL+wDwnzd/RcA X-Received: by 2002:a9d:6b82:0:b0:6dd:f0a6:dfea with SMTP id b2-20020a9d6b82000000b006ddf0a6dfeamr6549803otq.26.1707331674880; Wed, 07 Feb 2024 10:47:54 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707331674; cv=pass; d=google.com; s=arc-20160816; b=cbkuCQjMnLnaz6tJjcwQ9BkCmnp8QAz6dNDJ3VpL68SyY3j3S9l+Zv8og4G9IgTEFj a3Y2nSTWELOt/jVu59037wPZkNc2tL8Qh+y6aEOVAJYW8qVpOzClWbGpdEEkCXmO2+3w PLaFgJrwycxZrdYTj6K4u6VAlPmyD/mD0w92+ToKUbdyLZfPQJwj4rSIN+D1W1aC7gjF f3NP99ZNfYT7pwAyPyImKQi3nTqzZhv/SQHz0f39zq3SATmWa3EKsb06i4E3RzjqGdtN 2C7ceGgKVtMilxppwR9sOQ+oCeuX0T6h5UiNYgt8OcVEchssMZxV3lGUtZnwsXCWY8vJ UK0A== 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=zu7EkMiXkp7qHGnWy3N3PhSc7NN4TeHrs0sgZSmh6bo=; fh=f2zp4Ppt5cmAeWva6DPx3VFmJuFOnz93MJXZNQFvTV8=; b=pOl9STLayUFb5mzRhwqfidHLPuOeVIw7JRXlqd+syId+O+u8VfGglg6Lr52p/xtRvd 8T3yISIx9ySdOpy4C39s1Lv+Ca/KbvYaIX5J8OZckULt9ce9t4bnJt2+UasBe2Dbg1uB 7+ErXq5MTv/WzRQ0C8Al12B93t1/5vTIBQ8zvZkXQ7BUv/X24DY78LLnLjV2jvKo7GD7 a4UbZDz81xi26lzdf8zSe/K7YyFvKFq+4q0J4UJNajx0eTOdxNIXFgRVuw/UoTwWCKqh wNwWJo83jInQurG8jnHJL9NJGDDtFBagLil8lERF6DZEGwDIHmzceJD0mrPvR2gIJ/Jz W7mw==; 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-56932-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-56932-ouuuleilei=gmail.com@vger.kernel.org" X-Forwarded-Encrypted: i=2; AJvYcCW+wRSsUzQqGIgkXXOgmYeRrsPm9WTDBgSLS0lXEMDPdIolU8nv7gyao0hlIc8fG5GiJs9Lp/4hi6LhjxhWGog4m16pbg== Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id s12-20020a63770c000000b005d54ef5dd07si2179349pgc.161.2024.02.07.10.47.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Feb 2024 10:47:54 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-56932-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-56932-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-56932-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 9F3DE284995 for ; Wed, 7 Feb 2024 18:47:54 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B55CD133292; Wed, 7 Feb 2024 18:43:33 +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 A73318564F for ; Wed, 7 Feb 2024 18:43:22 +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=1707331405; cv=none; b=Hzb5KfCvCFfEC6DoZgRLURScS887Qi+agdyTE/z3h74YkEjCQQg10BGy7Qozt5VCCwSB6gWQrpMea0B4KmBgbFDTWE0ELvSHVRHJD4z6UBVlevZ7mhGdpSVO4zrKmBkaADXWsLPydMnB6cqFTZumgqq/gA1f8q28oHdm6oHiHLs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707331405; c=relaxed/simple; bh=82BqdfYVCWT3Ohz5KyeQLipnBnJA3+PJw9sXj8PFqAY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=n/SDvWzL38dqGN/hePiEVo0v+CNGjLqT22hz2nSqQayEmzF6LkzlXAYkGMVNR89ga0WGozOowNytKup0wbWUzn0YC98BsMzzTRn0U/2CfJb60Dv036MIP3JK/6qbmeqBqF4mckBRTVfoAZJjpN22vGAL+mytKB7dYZl2bCd/qOI= 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 1rXmt7-0007eW-1z; Wed, 07 Feb 2024 19:43:13 +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 1rXmt6-0054Xi-7q; Wed, 07 Feb 2024 19:43:12 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rXmt6-00HRsk-0V; Wed, 07 Feb 2024 19:43:12 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Mark Brown Cc: kernel@pengutronix.de, Benson Leung , Tzung-Bi Shih , Guenter Roeck , chrome-platform@lists.linux.dev, linux-kernel@vger.kernel.org, Jonathan Cameron Subject: [PATCH v3 15/32] platform/chrome: cros_ec_spi: Follow renaming of SPI "master" to "controller" Date: Wed, 7 Feb 2024 19:40:29 +0100 Message-ID: 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=1899; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=82BqdfYVCWT3Ohz5KyeQLipnBnJA3+PJw9sXj8PFqAY=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlw86nU9GnftRL96TAXX7wsHrdPDZV8of/reV7I lhz81IJPcCJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZcPOpwAKCRCPgPtYfRL+ TnzPB/9dGwqLUtwjxbKxr2hjwVfulj2JlwzRozoJEw1LRWZfdHqEColaRC+wCKhfTDuKxqQi11T pMUWzpekGpc/lZ6nyKmBAVkMsWblZCLeSumNRC6lV2CKO32ZuOsYyW0gi5czelg7sTjD83hUfqL mHY2Cz1TPs/zcurJRPYBiKVUrcRqItQVgmIT+Rp4xmjadVAL+1lNGHdws0zWb+/fUweCk2voMpz eq75Str5OqwdudEpGZHm+qz3n//dpjtHpwjsFfQgOjrerEfz9fJF7KC34ycUjb6UqaEYmdTF3+w TP+PPbBqPef/qtRTbjBhq63kpGnXPB3blR8wdzP03/KCtUn6 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: 1790267018228218653 X-GMAIL-MSGID: 1790267018228218653 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. Acked-by: Tzung-Bi Shih Acked-by: Jonathan Cameron Signed-off-by: Uwe Kleine-König --- drivers/platform/chrome/cros_ec_spi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/platform/chrome/cros_ec_spi.c b/drivers/platform/chrome/cros_ec_spi.c index 3e88cc92e819..86a3d32a7763 100644 --- a/drivers/platform/chrome/cros_ec_spi.c +++ b/drivers/platform/chrome/cros_ec_spi.c @@ -409,7 +409,7 @@ static int do_cros_ec_pkt_xfer_spi(struct cros_ec_device *ec_dev, if (!rx_buf) return -ENOMEM; - spi_bus_lock(ec_spi->spi->master); + spi_bus_lock(ec_spi->spi->controller); /* * Leave a gap between CS assertion and clocking of data to allow the @@ -469,7 +469,7 @@ static int do_cros_ec_pkt_xfer_spi(struct cros_ec_device *ec_dev, final_ret = terminate_request(ec_dev); - spi_bus_unlock(ec_spi->spi->master); + spi_bus_unlock(ec_spi->spi->controller); if (!ret) ret = final_ret; @@ -554,7 +554,7 @@ static int do_cros_ec_cmd_xfer_spi(struct cros_ec_device *ec_dev, if (!rx_buf) return -ENOMEM; - spi_bus_lock(ec_spi->spi->master); + spi_bus_lock(ec_spi->spi->controller); /* Transmit phase - send our message */ debug_packet(ec_dev->dev, "out", ec_dev->dout, len); @@ -590,7 +590,7 @@ static int do_cros_ec_cmd_xfer_spi(struct cros_ec_device *ec_dev, final_ret = terminate_request(ec_dev); - spi_bus_unlock(ec_spi->spi->master); + spi_bus_unlock(ec_spi->spi->controller); if (!ret) ret = final_ret;