From patchwork Mon Jan 22 18:06:56 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: 190326 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2bc4:b0:101:a8e8:374 with SMTP id hx4csp2770681dyb; Mon, 22 Jan 2024 10:55:09 -0800 (PST) X-Google-Smtp-Source: AGHT+IE2iz+VpRVoFij9omyUwqEhF+2SP/MYURc8+UYLt/zgHkEapkCW+eFNtg8SN8wupOgvNu3m X-Received: by 2002:a05:6a20:4315:b0:199:dab1:8b6e with SMTP id h21-20020a056a20431500b00199dab18b6emr6491320pzk.39.1705949709628; Mon, 22 Jan 2024 10:55:09 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705949709; cv=pass; d=google.com; s=arc-20160816; b=cvHAPKR56LBv/8tjqXP8sa9kByrdQpywGnDE+dmMn2fBJG9askhZdC7I0Nl+gsnRhN YscwzLDs+m6XttxmRahqH/CuQ3idBm0+eOm7LYlvsEVNGNKeouM2vF/g2OaLnTEV52ao k0qJgRqF26998D2dVqsWVe2imSPINSXP5mKNPmLma5Grxnmk41zAkK3e8GXY6SRnS+R8 mPTPThVFC4Ct6C1iaIrb+9DgNz32lbQN/f0uTF8TLXscQFPEf4J2ptfC9C5caBDG9N+5 MLuWavdm44LIycl4L3nJnUU2a4AWnriRgfi5SG2MvkFETrcRyei7aNK7wyR9/0GAiuMk ZvIQ== 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=HJ9uxmySVhZo5ci1txNbj1dKT085vBnQgy4kT1JrpPM=; fh=wBwhIiYP6X1lBOV8DGVwCyjMwqpUwlDUkmBVbwdMB/o=; b=K8flrFqEiL68UYNtKKl5T1xyUW+VegUxQJrWozsKavCQZJUW9wLjCYQot9U//72ppL 7b4MtBgz3W8nGesEoMJRsCU2DXX5eDwrClDGgIGWmx5UcK0TQ6UiPjz5aWGkyW1vB/k4 oy9fprlk+OJegfbhHLzz4pT3FZuYd0yQMX7MT1Wv81gffF9UXsekibndn7s7FE0TTPbw ex3bJdGGrUW2IZ5pitrRMp/lM6o4MuIbqSwmhTW8Y6SSNGlpmFN6kQbjEH1sAnCkgh63 KpZnvpZ68+dVzZMb7mHZBAVoW8+fhanSwDG7cj+KZp0sr5phHIU8pjTzQnjvZOmpqLyi HdUg== 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-33928-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-33928-ouuuleilei=gmail.com@vger.kernel.org" Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id y30-20020a63181e000000b005cfda2fa39bsi450148pgl.776.2024.01.22.10.55.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jan 2024 10:55:09 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-33928-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-33928-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-33928-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 EBE682977C1 for ; Mon, 22 Jan 2024 18:43:12 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A7EF56313B; Mon, 22 Jan 2024 18:08: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 2DF756089F for ; Mon, 22 Jan 2024 18:08:29 +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=1705946912; cv=none; b=UWNBZMgkWbaoKEoeFfm/uHpj0BwvWSbOl+cyv/I/okuiZIiSWv5/Xqq1N+BJapFdyieFxY6yFqwokMhGh3YEE26EZA0MYz+/Ft8C+9U61JZrXd6suAMIOr5bnsxbht4fOpUCNl+U+OtxqMMegV/ejddlRJLIczrbqfxuShuC5wE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705946912; c=relaxed/simple; bh=CT6mvx5MJLTpMbmu0NWGpTT+pYXsbShqSkc7JqmqXeM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=LE5sLlFaydgxE5VYfJ7MNsQEUYoZeUTwsVDf/C5URnQKN15PtqYkLKJ8DZ7bQ3HtyqaWmimhVACCHXNNc1Ezr3ZSb/oOtLcABuC2XqiZjeLda5etDnVNo7QoPL0WR9cDfIAxAMjW+yNODIJn43ecDhbhe1AmKX4cbYz8X53Bths= 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 1rRyiT-0001lQ-HX; Mon, 22 Jan 2024 19:08: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 1rRyiS-001ePF-Ra; Mon, 22 Jan 2024 19:08:12 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rRyiS-005Zwm-2S; Mon, 22 Jan 2024 19:08:12 +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, linux-spi@vger.kernel.org Subject: [PATCH v2 01/33] fpga: ice40-spi: Follow renaming of SPI "master" to "controller" Date: Mon, 22 Jan 2024 19:06:56 +0100 Message-ID: <62dce856652735aee45875325fe67a983ce0217d.1705944943.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=1144; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=CT6mvx5MJLTpMbmu0NWGpTT+pYXsbShqSkc7JqmqXeM=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlrq7E/sL5DoPQSDlOukasGqhLuAhZ65r9MjlCZ Xt+uBQMY/qJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZa6uxAAKCRCPgPtYfRL+ TrTWB/wO9zpn0hQi6pl9qxqHj4H+TWOyPJ3yO7coDr5AuP33ZJ62Cj2l5x2x5o8ijso2Yh0MPGQ URMbuiP3Jc5PNcNk1TgtKCBOsTSOw+LdUWKA7OOQaT5fxdBqwdV1YyNk05ZJ8ve8ZNwg1+Wr8LI VXL8xzUHEcBIaklZJSDxKw6bXM2oirDyzUoFLURfz5cRXYCZaKmSROvqJYT7YN0//EZUeKXUYkg ighY/cqEeosCrYr3ZwAygp8iolwgOgpcAfpEsCMCFy+2RmdFPDa7xd0azbdXhD9P0fjTe0VrCmB S+EjGJysfTvqm47CAI4hqMIgLKf5RcmoYBl/FYhRrHFr/E6g 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: 1788817922509829236 X-GMAIL-MSGID: 1788817922509829236 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 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; }