From nobody Thu Nov 14 04:44:35 2024 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 ; 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 ) 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 ) 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 ) id 1rRyiU-005ZxN-2S; Mon, 22 Jan 2024 19:08:14 +0100 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: Mark Brown Cc: kernel@pengutronix.de, Arnd Bergmann , Greg Kroah-Hartman , 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: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: 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: quoted-printable 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 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=C3=B6nig Acked-by: Greg Kroah-Hartman --- drivers/misc/gehc-achc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 *sp= i, struct gpio_desc *re struct spi_transfer release_cs =3D { }; int ret; =20 - spi_bus_lock(spi->master); + spi_bus_lock(spi->controller); =20 /* 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 =3D spi_sync_locked(spi, &msg); =20 fail: - spi_bus_unlock(spi->master); + spi_bus_unlock(spi->controller); return ret; } =20 static void ezport_stop_programming(struct spi_device *spi, struct gpio_de= sc *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); } =20 static int ezport_get_status_register(struct spi_device *spi) --=20 2.43.0