From patchwork Wed Feb 7 18:40:15 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: 198047 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:168b:b0:106:860b:bbdd with SMTP id ma11csp2435641dyb; Wed, 7 Feb 2024 10:49:51 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWmhugl90C3pcWfUAo7aQgT1gGfsfePi8xnLYCgA0hQSVJ/pGmSMcy8hpbUG6k/IZF0AzFL9XodMbZt0h2+v5ZnP8Mejg== X-Google-Smtp-Source: AGHT+IEkIRPNhhnKhc/CRvlygk0IvxGd3/oqoxYEU4fVE7YgR8QFO4wI4oFA9x1u8vQQMR8oRcjq X-Received: by 2002:a17:906:cd1:b0:a38:24ba:99d5 with SMTP id l17-20020a1709060cd100b00a3824ba99d5mr3621960ejh.56.1707331791590; Wed, 07 Feb 2024 10:49:51 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707331791; cv=pass; d=google.com; s=arc-20160816; b=YJ3uaQZ2urSRO4F4Tv1fDj7CEZcfydG7jvVqAGCJyiRTOzCI03RiQdwgRMXxul22Fp FVQpnq/5O83EuorMIAQ7Vva4yZiZb1NNe7dWVPZ6JLcj0JH4kbXYWsg+jYXevym5Z9ub MuHytoqFdY/dtlw6roZFz4XenBi3/mHD/T+FTBmvrZ9h12kZHgQVoql8Wr9AMzxD4jFi ioIhC3SvpDVAWnDL3EcrYa8mA6o1fHP987J4d4IAUAi3rTftRAfAUT/BMAX/P4WGFx3Q yJYdayM/bkKmulYE4Sh0/T5rMZYzTjvrodyQLyhrSpOP/L7rtBmM7W/3PidCjT/r7aj5 yTWg== 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=Iju/hLZ49VEr5WdWvs2ZuHN27I3kJyEjqvd7Ozy72fU=; fh=3zMiL7YV18KjcfEvZfpeieOKQtZX1hFT0S3OxZIg6g4=; b=yznrrnYLWZHkvRh5//Gw1ZKACRCjw7CDUjOgqbhTH+jlaCeG1aobUebK9Or/J90dsl XTWWG26grrxvAz0wXdhA1wwf9TrPUoSfmxGyKutNCr2n95u3xv6IwhkkwSKG/eZwRNbx oGPy85V55G68brfNmVatT9+Sf2fGF2WxXUmv+l7pacWzKCkQ+Fz3IDJCuwyOL6JbYm1c T53WQMouN02R4Od0TGL5Z8iIVmxo6niffWQ3rcKWLX+A8rLCq+NGjvKClvCmyP62CZvl ChMcqgNuyQzoH3MfF6xVLUOO8yTp/rtBCVI4xx1xj0aRaM631XB+1OQKD54UmAJQ59Yk FllQ==; 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-56934-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-56934-ouuuleilei=gmail.com@vger.kernel.org" X-Forwarded-Encrypted: i=2; AJvYcCUoPP72cDEJKiydzzV/TMeF1sGr8eYLNUhQzGLITP1NMJHMVuX5aLNetcp9yb6dKdAyxw6G6ex/rzoFQyT/+B7gPagQ0g== Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id a20-20020a1709064a5400b00a3887332fb6si814932ejv.1018.2024.02.07.10.49.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Feb 2024 10:49:51 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-56934-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=pengutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-56934-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-56934-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 am.mirrors.kernel.org (Postfix) with ESMTPS id 36CD41F23B3C for ; Wed, 7 Feb 2024 18:49:51 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id BA26A136675; Wed, 7 Feb 2024 18:43:36 +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 7C5B7127B4A for ; Wed, 7 Feb 2024 18:43:23 +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=l/e7yA1U/yOWRMz1SbXXPp2oTBb+AVJqCL2Hj5Nh1Vra1bXqwyhfbtKgwbJJTowb5H253Cz5HRURclkfcasTi3OdKLt/QP7SSLaBQidA4MqPUJSOOvgkK3DZMgPE6RaesSFYLD57aAnMbJ0BmxsWWjS1COwJUWTHPgiqMh/HccQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707331405; c=relaxed/simple; bh=wUvKlZOylTR25ACwo1tz3FpcLw1cTa0qMahNcZYRNf0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=ZkY5wXmbKAkLyBIfd6P/V3y5HXCiR45nMkHQqekQkcMGBak2yiuBNuWksB/DhT2kAGdFaLTMSLid0zaUvHoeKNkpAS7t/68yW6NV6Q1AqwGHDN4Mg68a+D/S7N2TXg+qrBeP4KXQt/NVysjpLXurF+kDvZiEI8U5AjSkCwzjDco= 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 1rXmt4-0007PG-4K; Wed, 07 Feb 2024 19:43:10 +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 1rXmt1-0054Wq-JH; Wed, 07 Feb 2024 19:43:07 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rXmt1-00HRrk-1b; Wed, 07 Feb 2024 19:43:07 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Mark Brown Cc: kernel@pengutronix.de, Moritz Fischer , Wu Hao , Xu Yilun , Tom Rix , linux-fpga@vger.kernel.org, linux-kernel@vger.kernel.org, Jonathan Cameron Subject: [PATCH v3 01/32] fpga: ice40-spi: Follow renaming of SPI "master" to "controller" Date: Wed, 7 Feb 2024 19:40:15 +0100 Message-ID: <6a3ddedc955cf55dddbc68ccf5ff5e46af5e8b6f.1707324793.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=1202; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=wUvKlZOylTR25ACwo1tz3FpcLw1cTa0qMahNcZYRNf0=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlw86WUHAWkGcRfm4ejb22wIJkr4J5rq2dd4nnu y/Az1s+R7eJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZcPOlgAKCRCPgPtYfRL+ TvfOB/0VlX4j2NqYav7kvi55bMy4jP6iZ3BIVkH0MRTghLES4nrb+1y5l4G/49O2EKKyPIW4iVs go4FGGmaiaNPY4RUMrddvye1xfL+JfeIJy/1TvY+kc4F094/W32Is0aoqpVvXw5RtuEnRNVQjMd 1K6kOOcg/fveKQ+rkk7YMlS/EzchGWPv7NIFg+la+rls+KqpPspsyJcHW4gamQE0tBlMLGKRxna oL1SM66D2wVkaEaon/Je5Jlo+8LTIeYZAk43xU/CGJsw5kEySsTm/S+iLwSTBkbXPwU3GLTJV1n /Af9dbfu5M4DV54F/wxpKUAWLRJIKBNvNobOQI8y7rKkhx0e 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: 1790267140901833618 X-GMAIL-MSGID: 1790267140901833618 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: Xu Yilun Acked-by: Jonathan Cameron Signed-off-by: Uwe Kleine-König --- drivers/fpga/ice40-spi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/fpga/ice40-spi.c b/drivers/fpga/ice40-spi.c index 7cbb3558b844..c0028ae4c5b7 100644 --- a/drivers/fpga/ice40-spi.c +++ b/drivers/fpga/ice40-spi.c @@ -66,7 +66,7 @@ static int ice40_fpga_ops_write_init(struct fpga_manager *mgr, } /* Lock the bus, assert CRESET_B and SS_B and delay >200ns */ - spi_bus_lock(dev->master); + spi_bus_lock(dev->controller); gpiod_set_value(priv->reset, 1); @@ -94,7 +94,7 @@ static int ice40_fpga_ops_write_init(struct fpga_manager *mgr, ret = spi_sync_locked(dev, &message); fail: - spi_bus_unlock(dev->master); + spi_bus_unlock(dev->controller); return ret; }