From patchwork Mon Jan 15 20:12:48 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: 13520183 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 D5BA5199AA for ; Mon, 15 Jan 2024 20:21:23 +0000 (UTC) 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 1rPTSE-0004fx-Ln; Mon, 15 Jan 2024 21:21:06 +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 1rPTSD-0005g2-3u; Mon, 15 Jan 2024 21:21:05 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rPTSD-000N7A-06; Mon, 15 Jan 2024 21:21:05 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Mark Brown , Geert Uytterhoeven Cc: linux-spi@vger.kernel.org, kernel@pengutronix.de, Alexander Aring , Stefan Schmidt , Miquel Raynal , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , linux-wpan@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH 02/33] ieee802154: ca8210: Follow renaming of SPI "master" to "controller" Date: Mon, 15 Jan 2024 21:12:48 +0100 Message-ID: <66d516d935840af55e72e0530029060ae4cf399b.1705348269.git.u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-wpan@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=908; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=viIJB1YA7PtqrHC+8uYauPsPwL5VV9v1q5W7pbGvVPQ=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlpZHDNmypmU/PE8nGJ9VT1nWZxBfqJAOeOqnan scNCQXrX9SJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZaWRwwAKCRCPgPtYfRL+ TuaWB/9qcFjHpaOy1YtAx1PGTsnZ4E35k1ai7tzKmqpJq8d5Ie8aMv2t4xKZuVx4Ua0Ukfk7tUI 7ryLY00+5D5ntFRG5ndhGgPoJxCglsA2iLHpPwl8+TP+Xpvmje3F21pHOzjls9ODKBBSKPpcgVM sIrmWoLQK+UvpPT25HBii4i8AZ+w46BFKIo7HpJImM1G7DWzX95bwkHIGL/0cKFtvRz7oJrTi33 R1DceIp3DvZLjmviK8+1qj/QvLa23qEspgJW3HDRwAx1LI9WTf+V2pKh0BM6DVpkdrIui6IiiYi Pqdp/Quxl2zg3oDuzFfro6vMwCKzyTOFMxPZgUMK9zel2KAR 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-wpan@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önig Reviewed-by: Simon Horman Acked-by: Stefan Schmidt --- drivers/net/ieee802154/ca8210.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ieee802154/ca8210.c b/drivers/net/ieee802154/ca8210.c index 4ec0dab38872..f732c150462b 100644 --- a/drivers/net/ieee802154/ca8210.c +++ b/drivers/net/ieee802154/ca8210.c @@ -2956,7 +2956,7 @@ static int ca8210_test_interface_init(struct ca8210_priv *priv) node_name, sizeof(node_name), "ca8210@%d_%d", - priv->spi->master->bus_num, + priv->spi->controller->bus_num, spi_get_chipselect(priv->spi, 0) );