Message ID | 9a5c94968010aaf0c1d013f357fcbef428bb11ce.1705944943.git.u.kleine-koenig@pengutronix.de |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel+bounces-33912-ouuuleilei=gmail.com@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2bc4:b0:101:a8e8:374 with SMTP id hx4csp2768071dyb; Mon, 22 Jan 2024 10:49:13 -0800 (PST) X-Google-Smtp-Source: AGHT+IFUufxHqdPKbBv2IT5BwNb1VEY4YajY7TcFmPbo/RkqiB6XWuazeUN+cnwxBXlo71uyjo1M X-Received: by 2002:a17:902:da89:b0:1d7:4dfa:cbc0 with SMTP id j9-20020a170902da8900b001d74dfacbc0mr1518270plx.90.1705949353189; Mon, 22 Jan 2024 10:49:13 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705949353; cv=pass; d=google.com; s=arc-20160816; b=Ev2fnWUUE/wsufrM2ChJPHR79P6TzPeT6UvANt0LMSAsk6lMy8cEeLUWOBlDaZXmAN LRWK0LzCBY+JW5GX9qxfG4HJipKHHEVUx5xYojFWpobmkp/ZAIdeWyJG3XO6v0pUNJW5 jJRw+Im0e5lv9l4T8dv654SwQCtdbQjOZL5bRAmP9Z3wEy/ugeXO5zvSy005U22sbCHm Kjnbtv9kZDbPYzd8WDi2KayDge2geJGtblcmY/LznFTNEMNRBaqz6ZH2ASuCO7JNX86G xFbbaRA1Sd8pGugcciJnH/0X0Yr1GYLi8omgoFq4gHmzqsb0/wJ1Qa9LogdlggA4Aa7+ 6+RA== 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=LhG49CyVCtnu/ZssH6fafb7FWtVb5DnGFYRXrCtxJ7Y=; fh=rs49P4uE4zkStztXUazekO8OjFz4LBbUP80dIW2XvmM=; b=H9hR671mlbdIoPEDfKbrCwNuTuheYeKcFLJP0fQ/suYb7W1vZJJe+EVQh0RnPvIIeS CKo58QclrfWNHvnd6spkHIBUKyZFWr0VRB3R+dgzDQOr7tskdnpEJo9Ov0TTMPZnOeVd brKq1X81wtVY/barsyYNxTs8j4CPmRad+STQ8PaYwO6rMuFKjt1L1kHe75mRVE8Fixdc mVr1HfltqHspDGHEWXZIXw3arDvxzbnasW7k3UdNFVokvJ+PdA+rq9e4PU7iObe3I1Am 5VbmNUvqzLmduEczjrInfevFWF2X+ieHVksAz/a/WGn8Oab+P+pU+KOA+ffgbgF5JXZv pdLQ== 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-33912-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-33912-ouuuleilei=gmail.com@vger.kernel.org" Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id w6-20020a170902a70600b001d5f261a528si8434272plq.398.2024.01.22.10.49.12 for <ouuuleilei@gmail.com> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jan 2024 10:49:13 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-33912-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=pengutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-33912-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-33912-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 1CA87292216 for <ouuuleilei@gmail.com>; Mon, 22 Jan 2024 18:37:43 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 5B3456026C; Mon, 22 Jan 2024 18:08:25 +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 DB6095FDC5 for <linux-kernel@vger.kernel.org>; Mon, 22 Jan 2024 18:08:21 +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=1705946903; cv=none; b=qBzLKnhg1/H9TJFXKPOf3K9mqI9CKH9gUDmCo9PnHsuAq3bNVydhNQfVKZLAHqvrQiVWd8juQKW3fNZBDRR75PhoulwmcXtKHA2H+8te731VumeFPv8SSw95V+9rPuZxSgQl2acXN79YIhFePS6ZtPEk7wy0PbOYyWyIsh3JkeU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705946903; c=relaxed/simple; bh=+Bwcd8J9EIWwY/Wo93zN3hICZCIsRFvVUKS8EPmC1YE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=UlaqrpAEuV1OFf28oy+MBa9Qcl0phxoWalrnWZ8Pqswds6U5LpWTRxLKSOL5l6Y2fpgzn5bF35CPAsGhJia+7YVzPz79bkp5BnxYHtFDVGqgd9uboElhumXBoqueTlxHcS5YHNR61BtGL35vkvKVZl0pDzjGDK96I54NfYQ01O8= 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 <ukl@pengutronix.de>) id 1rRyiV-0001pz-Tx; Mon, 22 Jan 2024 19:08:15 +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 <ukl@pengutronix.de>) id 1rRyiU-001ePl-RG; Mon, 22 Jan 2024 19:08:14 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.96) (envelope-from <ukl@pengutronix.de>) id 1rRyiU-005ZxN-2S; Mon, 22 Jan 2024 19:08:14 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de> To: Mark Brown <broonie@kernel.org> Cc: kernel@pengutronix.de, Arnd Bergmann <arnd@arndb.de>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, linux-kernel@vger.kernel.org, linux-spi@vger.kernel.org Subject: [PATCH v2 10/33] misc: gehc-achc: Follow renaming of SPI "master" to "controller" Date: Mon, 22 Jan 2024 19:07:05 +0100 Message-ID: <9a5c94968010aaf0c1d013f357fcbef428bb11ce.1705944943.git.u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: <cover.1705944943.git.u.kleine-koenig@pengutronix.de> References: <cover.1705944943.git.u.kleine-koenig@pengutronix.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: <linux-kernel.vger.kernel.org> List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org> List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Developer-Signature: v=1; a=openpgp-sha256; l=1529; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=+Bwcd8J9EIWwY/Wo93zN3hICZCIsRFvVUKS8EPmC1YE=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlrq7OFjYWLilaC8RRReNmWpwqu3I1mtgtuidRr cJ7eNh8PJKJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZa6uzgAKCRCPgPtYfRL+ TrTrCACNA0WNx2N0bxGJChpw50BJC7IYMHiiYe8/a1oVkzr7cyT4ud5YLPZyoHoGSaZjBwauYse E04yMykcruJla39DUzsSLx5u5uQAScotkGjWhQbH94TvN54yIO9DFZe5f821hJMXeOM8aEgB2Vs /ZNjP71Muuf5vBMHRcZn/FpMz0cDDQ/CSuifar76fivK95mgf3IgJVgl+PzkIzdAdRrnvUnSmta VPYWNXsVB/O86UCR2tYg4TF8cvNW7qaK06qwDY1e0cSxoGMtu6xQobnsj/fBiYKKvtuzHwCKKoc e9ZE4DUcePQWGQocMJt1ve4pJm44MFeitzE0UqTQbsR9ebWE X-Developer-Key: i=u.kleine-koenig@pengutronix.de; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 Content-Transfer-Encoding: 8bit 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: 1788817548813878034 X-GMAIL-MSGID: 1788817548813878034 |
Series |
spi: get rid of some legacy macros
|
|
Commit Message
Uwe Kleine-König
Jan. 22, 2024, 6:07 p.m. UTC
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.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
drivers/misc/gehc-achc.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
Comments
On Mon, Jan 22, 2024 at 07:07:05PM +0100, Uwe Kleine-König wrote: > 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. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git a/drivers/misc/gehc-achc.c b/drivers/misc/gehc-achc.c index 4c9c5394da6f..b8fca4d393c6 100644 --- a/drivers/misc/gehc-achc.c +++ b/drivers/misc/gehc-achc.c @@ -65,7 +65,7 @@ static int ezport_start_programming(struct spi_device *spi, struct gpio_desc *re struct spi_transfer release_cs = { }; int ret; - spi_bus_lock(spi->master); + spi_bus_lock(spi->controller); /* assert chip select */ spi_message_init(&msg); @@ -85,16 +85,16 @@ static int ezport_start_programming(struct spi_device *spi, struct gpio_desc *re ret = spi_sync_locked(spi, &msg); fail: - spi_bus_unlock(spi->master); + spi_bus_unlock(spi->controller); return ret; } static void ezport_stop_programming(struct spi_device *spi, struct gpio_desc *reset) { /* reset without asserted chip select to return into normal mode */ - spi_bus_lock(spi->master); + spi_bus_lock(spi->controller); ezport_reset(reset); - spi_bus_unlock(spi->master); + spi_bus_unlock(spi->controller); } static int ezport_get_status_register(struct spi_device *spi)