From nobody Thu Nov 14 04:56:27 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 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=20Kleine-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 Content-Type: text/plain; charset="utf-8" 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 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. Acked-by: Xu Yilun Acked-by: Jonathan Cameron Signed-off-by: Uwe Kleine-K=C3=B6nig --- 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, } =20 /* Lock the bus, assert CRESET_B and SS_B and delay >200ns */ - spi_bus_lock(dev->master); + spi_bus_lock(dev->controller); =20 gpiod_set_value(priv->reset, 1); =20 @@ -94,7 +94,7 @@ static int ice40_fpga_ops_write_init(struct fpga_manager = *mgr, ret =3D spi_sync_locked(dev, &message); =20 fail: - spi_bus_unlock(dev->master); + spi_bus_unlock(dev->controller); =20 return ret; } --=20 2.43.0 From nobody Thu Nov 14 04:56:27 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 CFBD9127B55 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=1707331406; cv=none; b=E2eu99A0AsZ7PnvMuOcTdR6it/izNVgojZM9jbWXyzoPr7kXYGdwst3RbgSCE5+uTXhWpt+mfZAf9ArrNWnXqnpUfpv3KrynI66JOUWAP2SG5QjgObaGk3y2pNTTyZg07hulvMrRVBpok57ZC7IC0GfIcQerTOXRvA5DSHlu/zM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707331406; c=relaxed/simple; bh=jhiShNIsUFW7WZuiPMMO9tp0A0zw/Nl6K1uMEilFM+o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=VKcpPcqiIOmimvciCli6bEE+BGMwJOBmhDjNmKsRkWn8RNrw3yvA/RjpEpzbA1mqukNF6tFjIz6IoJ4ImIqVD/DSfOTC1z8SvemK9anbclOARVqBDFnXC1Omq3jvZ5Ombc/imQ97BbbMGGkUrGRcwBT5E82ArjmtVCTn5uPSRmM= 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-0007PH-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-0054Wu-TG; 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-00HRrp-2b; Wed, 07 Feb 2024 19:43:07 +0100 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: Mark Brown Cc: 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, linux-kernel@vger.kernel.org, Simon Horman , Jonathan Cameron Subject: [PATCH v3 02/32] ieee802154: ca8210: Follow renaming of SPI "master" to "controller" Date: Wed, 7 Feb 2024 19:40:16 +0100 Message-ID: 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=1119; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=jhiShNIsUFW7WZuiPMMO9tp0A0zw/Nl6K1uMEilFM+o=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlw86YpPADTu1RuChoK8XIhMWiUShig6V8EeR+A faon0258syJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZcPOmAAKCRCPgPtYfRL+ Tk6LB/9wjazXcYYE7uG7eQtfAxFqUm9bUtQLOuOGo6MAeDXe6a5q6Di/eDdcaU7n+YTl43PLWn2 JwzVRuZ9NUPC01hYfdcKEMm9imlqBsOQf76A+3QCkiULt7kK8yvKDDRqp6t3c79K+wThBQiHLdJ QscK83OjZMtls5lniE9ZCOyPOsKhOz3baheWT+BZGzmA+n3vYo6P8TNM4S+3/XVVzX0JiVH13BN 0/dks7nExTrhJr6EN8CAmAkaOn2+ICax5hIVHZi6sLEjCZoZju8UDpljS3JtKFRJwUxl/+XnPgX 9auINxcE5koDy+wsS38mAqJiZVGP8QgM8pcatTeQuoVefGL4 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. Reviewed-by: Simon Horman Acked-by: Stefan Schmidt Acked-by: Miquel Raynal Acked-by: Jonathan Cameron Signed-off-by: Uwe Kleine-K=C3=B6nig --- 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/ca821= 0.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_p= riv *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) ); =20 --=20 2.43.0 From nobody Thu Nov 14 04:56:27 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 A74D385C40 for ; Wed, 7 Feb 2024 18:43:22 +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=1707331404; cv=none; b=BLXUJ2thQINeDZnO2NNJxYgCxDW1/epAqQNw3IaSTtBzX3JzywlsedAZ2lFJrXtlrWp1AdrtTl8sZfrqvIOV7c1WYwVtDdrGBFZJK1C9wygC1GGbS9aDdpmTnoRp7q+ggKu4OQZMFZ/bsY1JCwsRCX6gPovPL0Et0whgC78CCSc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707331404; c=relaxed/simple; bh=V9fXmo/wji/+Qk23ejom1WKCUrS23v2L7b4iJfa3OQA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=HNvMHccbr9OCYohC0R3sSzprAcXQzane2z93rCylGlEovj1UCUmcyMn8MH2vi9E8VldNjeD+ZkSLziLl92UJWCxHKYJ7c8m8UhzZEfNiqghj5sR0Yy4rMm+NvgE5+O/gkXJVrad7FzAxXQgVCngjo+AkgJKts/7RAZGDeq6QrWY= 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-0007PI-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 1rXmt2-0054Wx-6n; Wed, 07 Feb 2024 19:43:08 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rXmt2-00HRrt-0O; Wed, 07 Feb 2024 19:43:08 +0100 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: Mark Brown Cc: kernel@pengutronix.de, Lars-Peter Clausen , Michael Hennerich , Jonathan Cameron , linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, Jonathan Cameron Subject: [PATCH v3 03/32] iio: adc: ad_sigma_delta: Follow renaming of SPI "master" to "controller" Date: Wed, 7 Feb 2024 19:40:17 +0100 Message-ID: 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=2991; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=V9fXmo/wji/+Qk23ejom1WKCUrS23v2L7b4iJfa3OQA=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlw86ZyKdlBJFXTkRaTlW3JxU4uHlkNtqdRalfX 42PXw+zc2WJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZcPOmQAKCRCPgPtYfRL+ TgpoB/sG42rH0oJy7cNU1GO6xZc88KNodEBcy21UcMIEmp921dWqScaoL/tW/QS+Y7Eio0qP9PO 22kR4swKLlPypEABX4367G5P5VdtFe1Zeh7vNZEhhUJtEdDTHx4k6rk2ukk/UBHAfT8MlMbDBlA ymLmuDBbsxlvxs7EixDi73Ylo1IZ5EDMm0eJDdpyKfpOGZX3RA8XcJUwDrYIHoYA3M0Vme8qLHP DnhNfwgUEjkgjfAKsfaDVdM6S/0y7AB2b/k4GZwR+tZ8+inbjrEbAtUKac1swdAbUmMedwlAJYV JwooqnM+mTbr3MzmSFfY22lzxZ/uHxaV8O6q4A9KwucT3RMB 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. Acked-by: Jonathan Cameron Signed-off-by: Uwe Kleine-K=C3=B6nig Acked-by: Nuno Sa --- drivers/iio/adc/ad_sigma_delta.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/iio/adc/ad_sigma_delta.c b/drivers/iio/adc/ad_sigma_de= lta.c index 7e2192870743..55442eddf57c 100644 --- a/drivers/iio/adc/ad_sigma_delta.c +++ b/drivers/iio/adc/ad_sigma_delta.c @@ -212,7 +212,7 @@ int ad_sd_calibrate(struct ad_sigma_delta *sigma_delta, if (ret) return ret; =20 - spi_bus_lock(sigma_delta->spi->master); + spi_bus_lock(sigma_delta->spi->controller); sigma_delta->bus_locked =3D true; sigma_delta->keep_cs_asserted =3D true; reinit_completion(&sigma_delta->completion); @@ -235,7 +235,7 @@ int ad_sd_calibrate(struct ad_sigma_delta *sigma_delta, sigma_delta->keep_cs_asserted =3D false; ad_sigma_delta_set_mode(sigma_delta, AD_SD_MODE_IDLE); sigma_delta->bus_locked =3D false; - spi_bus_unlock(sigma_delta->spi->master); + spi_bus_unlock(sigma_delta->spi->controller); =20 return ret; } @@ -287,7 +287,7 @@ int ad_sigma_delta_single_conversion(struct iio_dev *in= dio_dev, =20 ad_sigma_delta_set_channel(sigma_delta, chan->address); =20 - spi_bus_lock(sigma_delta->spi->master); + spi_bus_lock(sigma_delta->spi->controller); sigma_delta->bus_locked =3D true; sigma_delta->keep_cs_asserted =3D true; reinit_completion(&sigma_delta->completion); @@ -322,7 +322,7 @@ int ad_sigma_delta_single_conversion(struct iio_dev *in= dio_dev, sigma_delta->keep_cs_asserted =3D false; ad_sigma_delta_set_mode(sigma_delta, AD_SD_MODE_IDLE); sigma_delta->bus_locked =3D false; - spi_bus_unlock(sigma_delta->spi->master); + spi_bus_unlock(sigma_delta->spi->controller); iio_device_release_direct_mode(indio_dev); =20 if (ret) @@ -387,7 +387,7 @@ static int ad_sd_buffer_postenable(struct iio_dev *indi= o_dev) =20 sigma_delta->samples_buf =3D samples_buf; =20 - spi_bus_lock(sigma_delta->spi->master); + spi_bus_lock(sigma_delta->spi->controller); sigma_delta->bus_locked =3D true; sigma_delta->keep_cs_asserted =3D true; =20 @@ -401,7 +401,7 @@ static int ad_sd_buffer_postenable(struct iio_dev *indi= o_dev) return 0; =20 err_unlock: - spi_bus_unlock(sigma_delta->spi->master); + spi_bus_unlock(sigma_delta->spi->controller); =20 return ret; } @@ -426,7 +426,7 @@ static int ad_sd_buffer_postdisable(struct iio_dev *ind= io_dev) =20 ad_sigma_delta_disable_all(sigma_delta); sigma_delta->bus_locked =3D false; - return spi_bus_unlock(sigma_delta->spi->master); + return spi_bus_unlock(sigma_delta->spi->controller); } =20 static irqreturn_t ad_sd_trigger_handler(int irq, void *p) --=20 2.43.0 From nobody Thu Nov 14 04:56:27 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 C16DA1272BE for ; Wed, 7 Feb 2024 18:43:22 +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=1707331407; cv=none; b=hMKUntfi7GmY2pHIWl5RivN6SiIkEeUD0jTfBqK1Axvgju95LliPIKfESIH5WakLVHJ1eXy2RpquWqQlA1vH4AshE7HNrqH6hkJDlm6ERefF34X+MY88+RbdzV85aTc3t9eHPWXWBdSKJivE2Rq6tz0rCEoNTLTOoege2uzUPVM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707331407; c=relaxed/simple; bh=w0zib0uOKooelRoLHu2pzWNfd/AGL8toKNMFBf38rNI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=tj5qBJokQikEfAAw1Xb+olf6xtb9Dw+C8v4E6f/5xPiRTpwU6T8qI28tzIHz3G22aEuj2dKkse6D9TI9iYX+O63v3UuqfoVmJ+IKfJZqG42WeXWvPnnfy/PHLqJKGbGtFXwD7zef9XXHF9k1UTELSDcJ/7sKlXHTOMhoTZEblgY= 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-0007PJ-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 1rXmt2-0054X0-Gd; Wed, 07 Feb 2024 19:43:08 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rXmt2-00HRrx-1O; Wed, 07 Feb 2024 19:43:08 +0100 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: Mark Brown Cc: kernel@pengutronix.de, Dmitry Torokhov , Jonathan Cameron , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 04/32] Input: pxspad - follow renaming of SPI "master" to "controller" Date: Wed, 7 Feb 2024 19:40:18 +0100 Message-ID: <820fa151077dc192391d546aec35328680803f9f.1707324794.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=1193; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=w0zib0uOKooelRoLHu2pzWNfd/AGL8toKNMFBf38rNI=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlw86a49NhPc2rBdHMRT3qom8TuhcSwM8PCc4D/ 75Kh/chVyGJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZcPOmgAKCRCPgPtYfRL+ TrW9CACPbeIOVyr466gklm2IUIKjis01iGt6HkKm4UnTUD26/My5rpTW49fL3c7R/KJj8/Kxip2 cxBHk044T0BvLB7BWatDCF9t2CUf1wMkAZ4q+UiZaYzIqu/W7+z7NzL3H4sBpsSsLE0EPbSC8Ll 5W7rraAbWwpk1ebzWzwMaEzObo9TbExVCsRMoENY0tW4pU+JJ6m8wtR0N2SaNGxWH+5w0jXdl+b atoBC/7q4zcVQsI86QGh3hB12MA5B0IiO8suyN/pVXFVDp/O0rb4F45F6nyUyZetfnhyPKZNYAE pL72XnTyhznJA60T6U5N/Bz1DoDZ1duK6hH7I9QcqLNUX4a5 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. Acked-by: Dmitry Torokhov Acked-by: Jonathan Cameron Signed-off-by: Uwe Kleine-K=C3=B6nig --- drivers/input/joystick/psxpad-spi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/input/joystick/psxpad-spi.c b/drivers/input/joystick/p= sxpad-spi.c index de734a927b4d..c47fc5f34bd0 100644 --- a/drivers/input/joystick/psxpad-spi.c +++ b/drivers/input/joystick/psxpad-spi.c @@ -342,8 +342,8 @@ static int psxpad_spi_probe(struct spi_device *spi) spi->mode =3D SPI_MODE_3; spi->bits_per_word =3D 8; /* (PlayStation 1/2 joypad might be possible works 250kHz/500kHz) */ - spi->master->min_speed_hz =3D 125000; - spi->master->max_speed_hz =3D 125000; + spi->controller->min_speed_hz =3D 125000; + spi->controller->max_speed_hz =3D 125000; spi_setup(spi); =20 /* pad settings */ --=20 2.43.0 From nobody Thu Nov 14 04:56:27 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 6825F85299 for ; Wed, 7 Feb 2024 18:43: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=1707331403; cv=none; b=iBx1u5p5RBGG/zRPRHUB9bdItccs+YCa5+PCuJ+50hVi+6UGx45Gw6HUDrAEn/QVq4o3/5xLylwrqTdw6ni+bldYhQ5obwsahD4DwodzJ07NjfHaLKm4RscOw9Nzag4mitkKY/YceqU2Ne4I2KRlMrrJTUYVvYtHPpctXAx1jLw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707331403; c=relaxed/simple; bh=ilkLmZbJFb+/vAwyD9IAoZLec6Zu+zWHyeLngMmfIFQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=lVKGzqgH6fNW864gsG7uYraD73j8yMbVw8UEMN1q1M3DD7xvfYveOIh5vAycTdetAW3ifatQa/Hbsgl/421qy2MZw08ijZfyspjjdMBeIgMxr+8faZQUnwDEEAvBm1aznqkkkTXBoHgrMUT6/V2fZjXsDbOzw0++6pdYY9Uqhmw= 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-0007PK-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 1rXmt2-0054X3-Nn; Wed, 07 Feb 2024 19:43:08 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rXmt2-00HRs1-25; Wed, 07 Feb 2024 19:43:08 +0100 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: Mark Brown Cc: kernel@pengutronix.de, Dmitry Torokhov , Greg Kroah-Hartman , Andy Shevchenko , Ulf Hansson , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Jonathan Cameron Subject: [PATCH v3 05/32] Input: synaptics-rmi4 - follow renaming of SPI "master" to "controller" Date: Wed, 7 Feb 2024 19:40:19 +0100 Message-ID: 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=1112; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=ilkLmZbJFb+/vAwyD9IAoZLec6Zu+zWHyeLngMmfIFQ=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlw86b5uqZYly+euxtkXa5tiGRisTdifEuh1Ixy mC277T9rpOJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZcPOmwAKCRCPgPtYfRL+ TjEoCAC0nEJ9m1CYYfN8CT2VU987E9pfcisamQB6slHvQYnnkIKDQ7cDsZNuhYqqB9wNG0+GXCe TjkpSkoUhRbcNKtesSG8lYCH2IwfVRo5qXpoOQ3QrsVMwf3LX1Vttey0H7ktM6HjNuXaAV9il7D FFVN4HK+ktpdAbdxAjtz7PnH4Mmr5odBWM8D1ApH6Hc5aEVc/gdMwN55cPSSSQLhmD1xcBsA4UM kfJgrghTBPids2dkXNIhnXBc2b4yzr4JkqCswoWrD2ag3POBuwbNO7OULQGqM4JoYwYOfP0ZmkW tiSoFjptqTdpseeXaMHymOMtanZV3W+pzFOdjHfdLHxDT523 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. Acked-by: Dmitry Torokhov Acked-by: Jonathan Cameron Signed-off-by: Uwe Kleine-K=C3=B6nig --- drivers/input/rmi4/rmi_spi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/input/rmi4/rmi_spi.c b/drivers/input/rmi4/rmi_spi.c index 07c866f42296..9d92129aa432 100644 --- a/drivers/input/rmi4/rmi_spi.c +++ b/drivers/input/rmi4/rmi_spi.c @@ -375,7 +375,7 @@ static int rmi_spi_probe(struct spi_device *spi) struct rmi_device_platform_data *spi_pdata =3D spi->dev.platform_data; int error; =20 - if (spi->master->flags & SPI_CONTROLLER_HALF_DUPLEX) + if (spi->controller->flags & SPI_CONTROLLER_HALF_DUPLEX) return -EINVAL; =20 rmi_spi =3D devm_kzalloc(&spi->dev, sizeof(struct rmi_spi_xport), --=20 2.43.0 From nobody Thu Nov 14 04:56:27 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 97DE185653 for ; Wed, 7 Feb 2024 18:43:20 +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=1707331402; cv=none; b=lZ8ZISm88zVv7rKqHgzEqfKIaOI0eB8PzxEYi1MVkgav7xMS4D8+DIvcz78Q1+qn4lKw0+qNVxGrvBVqLXEYFq4RPHwqLJdZNJmtPzexzHEjTGbEeImLWvEP1P2mv02UORXy+rTMiiHZFG/P/sUKgF8oenxdFo40QEKDLfuPN3c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707331402; c=relaxed/simple; bh=dhWD0Z+YKaeUZzQu8zoOP/L7SnMkWJpfcn5P3JRhYV4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=sMCwVvHUXtXRaCC0gMTrYOXxlccxxM0xQOoWIzJPcTd+aS/xg3Jn7vqILIbsf15/iuupxuCimB4kNpO/cEGVr7MVbdFYdDazXGPv5Idlf3hvgh7rxQrC4v2y75vCZPvqJ++tv7aCToHJJj91/slxJQ6A734iuYFDU7WVMFEsbK8= 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-0007PM-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 1rXmt2-0054X6-W8; Wed, 07 Feb 2024 19:43:09 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rXmt2-00HRs5-2w; Wed, 07 Feb 2024 19:43:08 +0100 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: Mark Brown Cc: kernel@pengutronix.de, Martin Tuma , Mauro Carvalho Chehab , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Jonathan Cameron Subject: [PATCH v3 06/32] media: mgb4: Follow renaming of SPI "master" to "controller" Date: Wed, 7 Feb 2024 19:40:20 +0100 Message-ID: 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=2469; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=dhWD0Z+YKaeUZzQu8zoOP/L7SnMkWJpfcn5P3JRhYV4=; b=owGbwMvMwMXY3/A7olbonx/jabUkhtTD5+b8nvLdg0uIv+DIlSi5rQ/jvPSusKarLAqvcjfNK uf16q/vZDRmYWDkYpAVU2Sxb1yTaVUlF9m59t9lmEGsTCBTGLg4BWAip6ew/89Wu7H96PW3+reP sb/fONlNtlGfJ7JacMHpX9022uvvBx15sKcj7m2dB2/Xt3C2ewWr0vSnMXeJ/1LWLu0Q81hnxqA Qkpg+52B1rvGSktVaRoJxEk8v2vutD65lXT1BOXmrbJ6E2OtnG32N7UIy537afXqK90Z+G7mCVr 6TuamKnzb7RR39Yinva7azLtE17uOWno53Kd3nZlq8XZUsmy3wIpZLcn3L7FWMejafnnI1yXW// rh7njSzt9CWp6us0rrNH66ewZ1lu2vGNIvkoMPs+3PVO4Ku/vAqbtUVWDXdMJd92/b7S2yWG28p Sl6dPksq6uWBr59aqxTjnSUFfps5aK2/fuNBSW5OkvUuAA== 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. Reviewed-by: Martin T=C5=AFma Acked-by: Jonathan Cameron Signed-off-by: Uwe Kleine-K=C3=B6nig --- drivers/media/pci/mgb4/mgb4_core.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/media/pci/mgb4/mgb4_core.c b/drivers/media/pci/mgb4/mg= b4_core.c index 5bfb8a06202e..9bcf10a77fd3 100644 --- a/drivers/media/pci/mgb4/mgb4_core.c +++ b/drivers/media/pci/mgb4/mgb4_core.c @@ -144,7 +144,7 @@ static int match_spi_adap(struct device *dev, void *dat= a) return to_spi_device(dev) ? 1 : 0; } =20 -static struct spi_master *get_spi_adap(struct platform_device *pdev) +static struct spi_controller *get_spi_adap(struct platform_device *pdev) { struct device *dev; =20 @@ -152,7 +152,7 @@ static struct spi_master *get_spi_adap(struct platform_= device *pdev) dev =3D device_find_child(&pdev->dev, NULL, match_spi_adap); mutex_unlock(&pdev->dev.mutex); =20 - return dev ? container_of(dev, struct spi_master, dev) : NULL; + return dev ? container_of(dev, struct spi_controller, dev) : NULL; } =20 static int init_spi(struct mgb4_dev *mgbdev, u32 devid) @@ -179,7 +179,7 @@ static int init_spi(struct mgb4_dev *mgbdev, u32 devid) }; struct pci_dev *pdev =3D mgbdev->pdev; struct device *dev =3D &pdev->dev; - struct spi_master *master; + struct spi_controller *ctlr; struct spi_device *spi_dev; u32 irq; int rv, id; @@ -207,8 +207,8 @@ static int init_spi(struct mgb4_dev *mgbdev, u32 devid) return PTR_ERR(mgbdev->spi_pdev); } =20 - master =3D get_spi_adap(mgbdev->spi_pdev); - if (!master) { + ctlr =3D get_spi_adap(mgbdev->spi_pdev); + if (!ctlr) { dev_err(dev, "failed to get SPI adapter\n"); rv =3D -EINVAL; goto err_pdev; @@ -242,8 +242,8 @@ static int init_spi(struct mgb4_dev *mgbdev, u32 devid) =20 spi_info.platform_data =3D &mgbdev->flash_data; =20 - spi_dev =3D spi_new_device(master, &spi_info); - put_device(&master->dev); + spi_dev =3D spi_new_device(ctlr, &spi_info); + put_device(&ctlr->dev); if (!spi_dev) { dev_err(dev, "failed to create MTD device\n"); rv =3D -EINVAL; --=20 2.43.0 From nobody Thu Nov 14 04:56:27 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 BF39485656 for ; Wed, 7 Feb 2024 18:43:20 +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=1707331403; cv=none; b=akXSskNu32JCJ1xttXsP0kYqXLn+GPt6u0j/vkrxqsel7Feud/frlmtPa5A/3Uz5WcoGIZ1HQyOxeKfwpkiU4GLGPFXR2amy+T85DofgFbpxgHtcycOKMM0/HHVoNw7o8LQtH4GfPblfE1JYxtU+jPRPPMW+M2ffHWnLOao4Qc8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707331403; c=relaxed/simple; bh=u1DZLmtE0m//kb49vnv/5y+j9bXLzgS8gAGkLLAZF+s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=hnI8P5mrv/UoAxOXI9tpq/icrYcPY3DtUQIPg/eWqWes5yFlUippQXqCXWQMknC6ak49c39HND514wo0OHyO/GwsmSKhhzOVEEvTvDEG30Gc3bHKyKTYPnmr0r/Xy6qdo1d9jAC/aeCS63gXM4b9AgmUFxlBHO6Cvr/U9xRaoMg= 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-0007PN-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 1rXmt3-0054X9-Ab; Wed, 07 Feb 2024 19:43:09 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rXmt3-00HRs9-0m; Wed, 07 Feb 2024 19:43:09 +0100 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: Mark Brown Cc: kernel@pengutronix.de, Sergey Kozlov , Mauro Carvalho Chehab , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Jonathan Cameron Subject: [PATCH v3 07/32] media: netup_unidvb: Follow renaming of SPI "master" to "controller" Date: Wed, 7 Feb 2024 19:40:21 +0100 Message-ID: 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=5398; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=u1DZLmtE0m//kb49vnv/5y+j9bXLzgS8gAGkLLAZF+s=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlw86d56zso/vil/299aNNJZqOzbIGJwnavXQI2 BK/vxaYjbyJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZcPOnQAKCRCPgPtYfRL+ TqXNCACmv41yxBTz0FMdMoupdOmGLIph6cXvmhlS30RlyH6zVYPd9luFYgcDmHScUEPPNXapaYy O2lRMBOASG5sofnf8w6Rekc2F90euev+IzlbPP84DNUU8aa1ia9+Nks8LtTcGayl+F8aQmGe2Fj bkWl6tyTgbXxn/bo7rchrB0Yw6bqGL5gqkaiDDisgzjUTUlqLAqlCF0ccyHFCjWETfxarDpUHOE cIjpfJ9NpYp/FPrAe0uyFlXyeDqIUMFUR6AteT9h8Qrn215QdVgggptz6zfddks4GQ+jsZstvW6 /R6AezAbVcrOqzSKWA7WsIWiaqes5kb1jFmfA1Esgq93Q5eE 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. Acked-by: Mauro Carvalho Chehab Acked-by: Jonathan Cameron Signed-off-by: Uwe Kleine-K=C3=B6nig --- .../media/pci/netup_unidvb/netup_unidvb_spi.c | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/drivers/media/pci/netup_unidvb/netup_unidvb_spi.c b/drivers/me= dia/pci/netup_unidvb/netup_unidvb_spi.c index 526042d8afae..e90aa1c1584c 100644 --- a/drivers/media/pci/netup_unidvb/netup_unidvb_spi.c +++ b/drivers/media/pci/netup_unidvb/netup_unidvb_spi.c @@ -35,7 +35,7 @@ struct netup_spi_regs { =20 struct netup_spi { struct device *dev; - struct spi_master *master; + struct spi_controller *ctlr; struct netup_spi_regs __iomem *regs; u8 __iomem *mmio; spinlock_t lock; @@ -78,7 +78,7 @@ irqreturn_t netup_spi_interrupt(struct netup_spi *spi) reg =3D readw(&spi->regs->control_stat); if (!(reg & NETUP_SPI_CTRL_IRQ)) { spin_unlock_irqrestore(&spi->lock, flags); - dev_dbg(&spi->master->dev, + dev_dbg(&spi->ctlr->dev, "%s(): not mine interrupt\n", __func__); return IRQ_NONE; } @@ -88,15 +88,15 @@ irqreturn_t netup_spi_interrupt(struct netup_spi *spi) spi->state =3D SPI_STATE_DONE; wake_up(&spi->waitq); spin_unlock_irqrestore(&spi->lock, flags); - dev_dbg(&spi->master->dev, + dev_dbg(&spi->ctlr->dev, "%s(): SPI interrupt handled\n", __func__); return IRQ_HANDLED; } =20 -static int netup_spi_transfer(struct spi_master *master, +static int netup_spi_transfer(struct spi_controller *ctlr, struct spi_message *msg) { - struct netup_spi *spi =3D spi_master_get_devdata(master); + struct netup_spi *spi =3D spi_controller_get_devdata(ctlr); struct spi_transfer *t; int result =3D 0; u32 tr_size; @@ -131,7 +131,7 @@ static int netup_spi_transfer(struct spi_master *master, NETUP_SPI_CTRL_START | (frag_last ? NETUP_SPI_CTRL_LAST_CS : 0), &spi->regs->control_stat); - dev_dbg(&spi->master->dev, + dev_dbg(&spi->ctlr->dev, "%s(): control_stat 0x%04x\n", __func__, readw(&spi->regs->control_stat)); wait_event_timeout(spi->waitq, @@ -144,11 +144,11 @@ static int netup_spi_transfer(struct spi_master *mast= er, } } else { if (spi->state =3D=3D SPI_STATE_START) { - dev_dbg(&spi->master->dev, + dev_dbg(&spi->ctlr->dev, "%s(): transfer timeout\n", __func__); } else { - dev_dbg(&spi->master->dev, + dev_dbg(&spi->ctlr->dev, "%s(): invalid state %d\n", __func__, spi->state); } @@ -161,7 +161,7 @@ static int netup_spi_transfer(struct spi_master *master, } done: msg->status =3D result; - spi_finalize_current_message(master); + spi_finalize_current_message(ctlr); return result; } =20 @@ -172,30 +172,30 @@ static int netup_spi_setup(struct spi_device *spi) =20 int netup_spi_init(struct netup_unidvb_dev *ndev) { - struct spi_master *master; + struct spi_controller *ctlr; struct netup_spi *nspi; =20 - master =3D devm_spi_alloc_master(&ndev->pci_dev->dev, - sizeof(struct netup_spi)); - if (!master) { + ctlr =3D devm_spi_alloc_master(&ndev->pci_dev->dev, + sizeof(struct netup_spi)); + if (!ctlr) { dev_err(&ndev->pci_dev->dev, "%s(): unable to alloc SPI master\n", __func__); return -EINVAL; } - nspi =3D spi_master_get_devdata(master); - master->mode_bits =3D SPI_CPOL | SPI_CPHA | SPI_LSB_FIRST; - master->bus_num =3D -1; - master->num_chipselect =3D 1; - master->transfer_one_message =3D netup_spi_transfer; - master->setup =3D netup_spi_setup; + nspi =3D spi_controller_get_devdata(ctlr); + ctlr->mode_bits =3D SPI_CPOL | SPI_CPHA | SPI_LSB_FIRST; + ctlr->bus_num =3D -1; + ctlr->num_chipselect =3D 1; + ctlr->transfer_one_message =3D netup_spi_transfer; + ctlr->setup =3D netup_spi_setup; spin_lock_init(&nspi->lock); init_waitqueue_head(&nspi->waitq); - nspi->master =3D master; + nspi->ctlr =3D ctlr; nspi->regs =3D (struct netup_spi_regs __iomem *)(ndev->bmmio0 + 0x4000); writew(2, &nspi->regs->clock_divider); writew(NETUP_UNIDVB_IRQ_SPI, ndev->bmmio0 + REG_IMASK_SET); ndev->spi =3D nspi; - if (spi_register_master(master)) { + if (spi_register_controller(ctlr)) { ndev->spi =3D NULL; dev_err(&ndev->pci_dev->dev, "%s(): unable to register SPI bus\n", __func__); @@ -207,8 +207,8 @@ int netup_spi_init(struct netup_unidvb_dev *ndev) ndev->pci_bus, ndev->pci_slot, ndev->pci_func); - if (!spi_new_device(master, &netup_spi_board)) { - spi_unregister_master(master); + if (!spi_new_device(ctlr, &netup_spi_board)) { + spi_unregister_controller(ctlr); ndev->spi =3D NULL; dev_err(&ndev->pci_dev->dev, "%s(): unable to create SPI device\n", __func__); @@ -227,7 +227,7 @@ void netup_spi_release(struct netup_unidvb_dev *ndev) if (!spi) return; =20 - spi_unregister_master(spi->master); + spi_unregister_controller(spi->ctlr); spin_lock_irqsave(&spi->lock, flags); reg =3D readw(&spi->regs->control_stat); writew(reg | NETUP_SPI_CTRL_IRQ, &spi->regs->control_stat); --=20 2.43.0 From nobody Thu Nov 14 04:56:27 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 CE6D0127B53 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=1707331407; cv=none; b=sTEc2loMOfcKBs5v/K3mA0ZkTP+wa5XmXyL8ua4FZEQkwB1/uqhYfQcuEj7tibu4/Q1vdv3eIFkJn8s05ZAQsoRqIZ4eKS9WnXZqq665cCUAFffeHqL4QUossLpqDM6ojk8c+7XFkKny2gB9bxJJKToOEbm2voFTpAh9BC2uxQo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707331407; c=relaxed/simple; bh=1f9SjqEJ981z82qsp+A5Bg52oPFT/FITs+AmF47LZUI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=g5orUyM2/ZUpolL+gkAA5wyaEyTy7lN3RuJquarX9Lcwa91fUWVpNtX3mxsgjCHO5+V4I/9knytzwLPacACGy3XRxqiXXQWAn5LSosNYN0alwLwzpiPL6MyYLIPn1BQv9SKxFYKGTS7J7AjDiqlzWUua+GpWvQZ+IxpoGxQROoU= 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-0007PO-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 1rXmt3-0054XC-Iu; Wed, 07 Feb 2024 19:43:09 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rXmt3-00HRsD-1c; Wed, 07 Feb 2024 19:43:09 +0100 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: Mark Brown Cc: kernel@pengutronix.de, Mauro Carvalho Chehab , Jonathan Cameron , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 08/32] media: usb/msi2500: Follow renaming of SPI "master" to "controller" Date: Wed, 7 Feb 2024 19:40:22 +0100 Message-ID: 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=3953; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=1f9SjqEJ981z82qsp+A5Bg52oPFT/FITs+AmF47LZUI=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlw86eyQiko4JVdjBa6qFmafT4vAq8x7fcZ2pyw 1ExWCiBMeeJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZcPOngAKCRCPgPtYfRL+ TksqCACokwYzPuYI6erNFFLbU3dYc2XSf8xz/Hanw9kE101+EY626A7Vx+WCfJ9alTu3kMISGfP xiqAQOGuw4HRpfKl55qLkulXeJRjtE1OrMObeeY4ksxEq8SAEVCJ7OfBNx1+uA26YBI/wjMzfyp wJ6V41Y4lh1v99L0wE/96K7ktzRqHwuMpp08WJVWeXQamoMg5IQ4EHPjVyyC+ccTVXcbCJw+FQj GbTbHY7bnvZ4itjqdrL9pKLCwhdts2m0qkYTPZB+nfPpQkWJYtmVhjD+awMgyZQdj6O1CsdB9lk xMoBncb2lHzI1eOWhFfcvaWLw7iBWtM9j61KHs5Gq4w7PM+4 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. Acked-by: Jonathan Cameron Signed-off-by: Uwe Kleine-K=C3=B6nig Reviewed-by: Hans Verkuil --- drivers/media/usb/msi2500/msi2500.c | 38 ++++++++++++++--------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/drivers/media/usb/msi2500/msi2500.c b/drivers/media/usb/msi250= 0/msi2500.c index 9759996ee6a4..5138486abfa0 100644 --- a/drivers/media/usb/msi2500/msi2500.c +++ b/drivers/media/usb/msi2500/msi2500.c @@ -107,7 +107,7 @@ struct msi2500_dev { struct video_device vdev; struct v4l2_device v4l2_dev; struct v4l2_subdev *v4l2_subdev; - struct spi_master *master; + struct spi_controller *ctlr; =20 /* videobuf2 queue and queued buffers list */ struct vb2_queue vb_queue; @@ -574,7 +574,7 @@ static void msi2500_disconnect(struct usb_interface *in= tf) dev->udev =3D NULL; v4l2_device_disconnect(&dev->v4l2_dev); video_unregister_device(&dev->vdev); - spi_unregister_master(dev->master); + spi_unregister_controller(dev->ctlr); mutex_unlock(&dev->v4l2_lock); mutex_unlock(&dev->vb_queue_lock); =20 @@ -1136,10 +1136,10 @@ static void msi2500_video_release(struct v4l2_devic= e *v) kfree(dev); } =20 -static int msi2500_transfer_one_message(struct spi_master *master, +static int msi2500_transfer_one_message(struct spi_controller *ctlr, struct spi_message *m) { - struct msi2500_dev *dev =3D spi_master_get_devdata(master); + struct msi2500_dev *dev =3D spi_controller_get_devdata(ctlr); struct spi_transfer *t; int ret =3D 0; u32 data; @@ -1154,7 +1154,7 @@ static int msi2500_transfer_one_message(struct spi_ma= ster *master, } =20 m->status =3D ret; - spi_finalize_current_message(master); + spi_finalize_current_message(ctlr); return ret; } =20 @@ -1163,7 +1163,7 @@ static int msi2500_probe(struct usb_interface *intf, { struct msi2500_dev *dev; struct v4l2_subdev *sd; - struct spi_master *master; + struct spi_controller *ctlr; int ret; static struct spi_board_info board_info =3D { .modalias =3D "msi001", @@ -1220,30 +1220,30 @@ static int msi2500_probe(struct usb_interface *intf, } =20 /* SPI master adapter */ - master =3D spi_alloc_master(dev->dev, 0); - if (master =3D=3D NULL) { + ctlr =3D spi_alloc_master(dev->dev, 0); + if (ctlr =3D=3D NULL) { ret =3D -ENOMEM; goto err_unregister_v4l2_dev; } =20 - dev->master =3D master; - master->bus_num =3D -1; - master->num_chipselect =3D 1; - master->transfer_one_message =3D msi2500_transfer_one_message; - spi_master_set_devdata(master, dev); - ret =3D spi_register_master(master); + dev->ctlr =3D ctlr; + ctlr->bus_num =3D -1; + ctlr->num_chipselect =3D 1; + ctlr->transfer_one_message =3D msi2500_transfer_one_message; + spi_controller_set_devdata(ctlr, dev); + ret =3D spi_register_controller(ctlr); if (ret) { - spi_master_put(master); + spi_controller_put(ctlr); goto err_unregister_v4l2_dev; } =20 /* load v4l2 subdevice */ - sd =3D v4l2_spi_new_subdev(&dev->v4l2_dev, master, &board_info); + sd =3D v4l2_spi_new_subdev(&dev->v4l2_dev, ctlr, &board_info); dev->v4l2_subdev =3D sd; if (sd =3D=3D NULL) { dev_err(dev->dev, "cannot get v4l2 subdevice\n"); ret =3D -ENODEV; - goto err_unregister_master; + goto err_unregister_controller; } =20 /* Register controls */ @@ -1276,8 +1276,8 @@ static int msi2500_probe(struct usb_interface *intf, return 0; err_free_controls: v4l2_ctrl_handler_free(&dev->hdl); -err_unregister_master: - spi_unregister_master(dev->master); +err_unregister_controller: + spi_unregister_controller(dev->ctlr); err_unregister_v4l2_dev: v4l2_device_unregister(&dev->v4l2_dev); err_free_mem: --=20 2.43.0 From nobody Thu Nov 14 04:56:27 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 57942128814 for ; Wed, 7 Feb 2024 18:43:25 +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=1707331407; cv=none; b=MlSDkJMEHg74+XhRgrR5hptpNotgzQU5tQMSJ6FXDCVBZY+BhRnM+O8T/OIU5V0VrPHa1tugjFIWKfURCzZaVxkQAZLcjAhXYZiX35XsZZ7Gh+VJ7cE6+DeA1Jz26Re4bY1hwr4Sznp5/07lQdPEayuaHOFsWXEVO/Bryoin2JE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707331407; c=relaxed/simple; bh=KaJJ8quxzgWB8y4pMleISYyM1DKK7MkNdnVgj/kZgVA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=r5uAancIVGZLx9kD0J3YvDd9NfEm6915gzVihxiAiu8EjFiSiMu8OmWC//5Il3f/g6rYLi2t4hSWc/LdNHxtgt6kJvfB6iAA37crC4bPhNpkj6lt5eeLFFqgijvxuJ0m+3ZdIKGjiF10f0aoZveTkvVAooE3hsSnS8fXd9Fc5Kc= 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-0007Q6-Fs; 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 1rXmt4-0054XF-1x; Wed, 07 Feb 2024 19:43:10 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rXmt3-00HRsH-39; Wed, 07 Feb 2024 19:43:09 +0100 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: Mark Brown Cc: kernel@pengutronix.de, Mauro Carvalho Chehab , Jonathan Cameron , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 09/32] media: v4l2-subdev: Follow renaming of SPI "master" to "controller" Date: Wed, 7 Feb 2024 19:40:23 +0100 Message-ID: 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=2547; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=KaJJ8quxzgWB8y4pMleISYyM1DKK7MkNdnVgj/kZgVA=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlw86g3V4NkM5t2iVxQniw0e6ww0L3UTrUHmKhS K0i3JBODmeJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZcPOoAAKCRCPgPtYfRL+ TmxbCACLR1jKX4MTNh5obO5h8YAhLVtwd1uz529v9zFqG4CpBWY3FG8foiklJOZbMNrBvF/CH6I +i4pKx16oVdeywvHnv8/Bnzww8mM1NlfwKf2LB4pVDmnD+6k4dE8eEeyHUQG226ZaeQNil4oW4G MmsR40iwY+soe7R2jsuOZ7drdmwGQDM/tI4y/szddPv4BjtL0iN7PI/nvguOiPVgqwJs0GUOflJ cKnL5E4zrb5JI8otzRQsJydgbtcZmOlTpMALeuQKLBgB3FJK9So/HtSfopdS7tP1+eieUeq/Qi+ cwo31VIPZJr2/DqJK1L08aOtXXmrBAnVofKaZ5E/oZADrQwJ 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 v4l2_spi_new_subdev(). Acked-by: Jonathan Cameron Signed-off-by: Uwe Kleine-K=C3=B6nig --- drivers/media/v4l2-core/v4l2-spi.c | 4 ++-- include/media/v4l2-common.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/media/v4l2-core/v4l2-spi.c b/drivers/media/v4l2-core/v= 4l2-spi.c index eadecdff7349..a7092c3930d6 100644 --- a/drivers/media/v4l2-core/v4l2-spi.c +++ b/drivers/media/v4l2-core/v4l2-spi.c @@ -34,7 +34,7 @@ void v4l2_spi_subdev_init(struct v4l2_subdev *sd, struct = spi_device *spi, EXPORT_SYMBOL_GPL(v4l2_spi_subdev_init); =20 struct v4l2_subdev *v4l2_spi_new_subdev(struct v4l2_device *v4l2_dev, - struct spi_master *master, + struct spi_controller *ctlr, struct spi_board_info *info) { struct v4l2_subdev *sd =3D NULL; @@ -45,7 +45,7 @@ struct v4l2_subdev *v4l2_spi_new_subdev(struct v4l2_devic= e *v4l2_dev, if (info->modalias[0]) request_module(info->modalias); =20 - spi =3D spi_new_device(master, info); + spi =3D spi_new_device(ctlr, info); =20 if (!spi || !spi->dev.driver) goto error; diff --git a/include/media/v4l2-common.h b/include/media/v4l2-common.h index acf5be24a5ca..739b0f0fc1a0 100644 --- a/include/media/v4l2-common.h +++ b/include/media/v4l2-common.h @@ -278,13 +278,13 @@ static inline void v4l2_i2c_subdev_unregister(struct = v4l2_subdev *sd) * * * @v4l2_dev: pointer to &struct v4l2_device. - * @master: pointer to struct spi_master. + * @ctlr: pointer to struct spi_controller. * @info: pointer to struct spi_board_info. * * returns a &struct v4l2_subdev pointer. */ struct v4l2_subdev *v4l2_spi_new_subdev(struct v4l2_device *v4l2_dev, - struct spi_master *master, struct spi_board_info *info); + struct spi_controller *ctlr, struct spi_board_info *info); =20 /** * v4l2_spi_subdev_init - Initialize a v4l2_subdev with data from an @@ -308,7 +308,7 @@ void v4l2_spi_subdev_unregister(struct v4l2_subdev *sd); =20 static inline struct v4l2_subdev * v4l2_spi_new_subdev(struct v4l2_device *v4l2_dev, - struct spi_master *master, struct spi_board_info *info) + struct spi_controller *ctlr, struct spi_board_info *info) { return NULL; } --=20 2.43.0 From nobody Thu Nov 14 04:56:27 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 6A0A782883 for ; Wed, 7 Feb 2024 18:43:16 +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=1707331398; cv=none; b=VMPx7+kpByiTWBvZcAaxJY0D0uqraMjuE31w9B+a/88E9K/bnChsNYdSZ9zwgcV+9nP5Jz9CnX/7J9xWeEZsSH3ML1qXnHmdKYNuXJGQxvG9o6QwxcamU84KkzFj6LX6zxJdghN2/98/eFNrneWxtJz66zRlzTEbl92bWUA/DuQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707331398; c=relaxed/simple; bh=ISdH8w89RgoFeG4mw+w0XtCxZMCx6Ijs0xa+U6wuLM4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=V7e8j7BlnGPVnGpJb4djVn3clYg0LsrMBCDL//5ZHJ0BWsEtjtFY5M0Wh190A5mrHQ5l6j6ZkJHbgH1psaPlEOSjeJhU1OVJrQHFKu9unXrlDDxtGiwVDsB+OpjCeDfMPkZu4SFTaAmSUd+JHlncVo/KIlEhXQp29rED6eWNjEc= 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-0007Qk-Sj; 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 1rXmt4-0054XQ-G3; Wed, 07 Feb 2024 19:43:10 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rXmt4-00HRsL-1K; Wed, 07 Feb 2024 19:43:10 +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, Jonathan Cameron Subject: [PATCH v3 10/32] misc: gehc-achc: Follow renaming of SPI "master" to "controller" Date: Wed, 7 Feb 2024 19:40:24 +0100 Message-ID: <3c93bf41d2399d06b5a379a76c8f6e877f3560b7.1707324794.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=1646; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=ISdH8w89RgoFeG4mw+w0XtCxZMCx6Ijs0xa+U6wuLM4=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlw86hQkaBkuFTlFDYTUPSXZKwC7XJB4U1RkwxD /64HwYu55eJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZcPOoQAKCRCPgPtYfRL+ Tg5RB/4ji79EENz4deLH5Q76yZhhYsQ9eDPTGWfeEzPgkxTu3IOw+T48nZ6I84b0W0ierBRekQ4 fOx1DqZaTZnZEHoD+YQvZqPh+L8pUgQGsSv9h9mrVR4GMoAEo5746xSOb4TGC6eR3w3O06pGdpf Wb5xOQ2eblckz/NQ3P5s1OOH892/0EShPR3hppQhNXTQ9mutnD7ivHuZ4MaoaV41mrRs/yCGRQ3 40a9vjgD76bZMlsCPwLkjdOqwIR1DIC68O1Dj3fWnTa1E0RxX93QshQSBbh8DBgwYah84vb7/OC SdjIS/4RkrrNdIjyVwOiVEoCJLB9bwbK207HpxWijqc9ZuMT 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. Acked-by: Greg Kroah-Hartman Acked-by: Jonathan Cameron Signed-off-by: Uwe Kleine-K=C3=B6nig --- 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 From nobody Thu Nov 14 04:56:27 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 9979A12C533 for ; Wed, 7 Feb 2024 18:43: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=1707331412; cv=none; b=hd94cV26mgky/o8H+Zmrt5BSSrdxtdI20ZUQJxEpDJCsElQ5fAzlbsUUt5hcCvJcJbJ930er2GURBfZOf9Nqr6boFNQ/IajXqxp2zvOF1VCdQAMWFeB7S4evkbZZtrrUb6RwL5w5QApd9isbttelPwweibQ9Fv7aL8VNeUeCmTU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707331412; c=relaxed/simple; bh=3uWg1dj8JY2x4YbDK4pPCpaqGziQ38xKtIysd488qoY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=bf2JtJyqg4In7xL4fWz6SEJs7PFdfOafBVRRiYNz5ZlHHCe2HWrhx9ZZDKpafl0S/1CnBJ754/s7Up1ehx2pA+CC8Q2IwMgc4EojiWVZk2y60/Go1Fh0Wg9AbuckvWFOO3asZ29nOjFeWK5Fu6welGRiliFShJxlOKS9a7wwpvw= 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 1rXmt5-0007Sd-Gt; Wed, 07 Feb 2024 19:43:11 +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 1rXmt4-0054XU-TT; Wed, 07 Feb 2024 19:43:10 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rXmt4-00HRsU-2e; Wed, 07 Feb 2024 19:43:10 +0100 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: Mark Brown Cc: kernel@pengutronix.de, Ulf Hansson , Andy Shevchenko , Greg Kroah-Hartman , Jonathan Cameron , Yang Yingliang , linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 11/32] mmc: mmc_spi: Follow renaming of SPI "master" to "controller" Date: Wed, 7 Feb 2024 19:40:25 +0100 Message-ID: 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=1681; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=3uWg1dj8JY2x4YbDK4pPCpaqGziQ38xKtIysd488qoY=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlw86iRgaXsnAONPwKcmuWcccjOTtI4N+LZaa3r vFnNuQq3YeJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZcPOogAKCRCPgPtYfRL+ TuGiB/4q83A3nbw2iRt8SUETQFwrm/YEhFpxFYwZ1pvftS7tqTK4D+okPck/OcXlQTFGX06Zcpl AYSRQUlRCEfjgyOn1yC3CYsT3dLPS879Y63xknQy3AiEOuTH7V20cldVljtwQV5YftBbugq28xn y/HUZhpyefhnnvbpca7Ghu+CtTg+8BeGDUelSW7vylKSdShiFD7F6Le6OIEwjrAny2SIN6194qo g1mSV9BD7CepqbONlfsGdqc9QDqDm7S5TsHNTyxSIMS4OiQPWfxNrRaVt3P4lYKAaLs0wrJHhMa nkUh9TPQj6RN6+KHZ75lTA3ym06Wxqrwls28Uryyx8FrseF5 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. Acked-by: Ulf Hansson Acked-by: Jonathan Cameron Signed-off-by: Uwe Kleine-K=C3=B6nig --- drivers/mmc/host/mmc_spi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/host/mmc_spi.c b/drivers/mmc/host/mmc_spi.c index b8dda8160c4e..bf35761f783a 100644 --- a/drivers/mmc/host/mmc_spi.c +++ b/drivers/mmc/host/mmc_spi.c @@ -935,7 +935,7 @@ static void mmc_spi_request(struct mmc_host *mmc, struc= t mmc_request *mrq) #endif =20 /* request exclusive bus access */ - spi_bus_lock(host->spi->master); + spi_bus_lock(host->spi->controller); =20 crc_recover: /* issue command; then optionally data and stop */ @@ -967,7 +967,7 @@ static void mmc_spi_request(struct mmc_host *mmc, struc= t mmc_request *mrq) } =20 /* release the bus */ - spi_bus_unlock(host->spi->master); + spi_bus_unlock(host->spi->controller); =20 mmc_request_done(host->mmc, mrq); } @@ -1157,7 +1157,7 @@ static int mmc_spi_probe(struct spi_device *spi) /* We rely on full duplex transfers, mostly to reduce * per-transfer overheads (by making fewer transfers). */ - if (spi->master->flags & SPI_CONTROLLER_HALF_DUPLEX) + if (spi->controller->flags & SPI_CONTROLLER_HALF_DUPLEX) return -EINVAL; =20 /* MMC and SD specs only seem to care that sampling is on the --=20 2.43.0 From nobody Thu Nov 14 04:56:27 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 3FB8B85C6B for ; Wed, 7 Feb 2024 18:43:27 +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=1707331410; cv=none; b=pwO80u5zke3vowkzThcv27CPCA18PwpjIXxmFp6Ytz5uPK4wB8lMKZx4yBZyi9Sf7teyyY487gF2a0F/dFUXSSXY5QQW3cmDmUmPqEE2QoRPeJjc0AapI1uQXuNlL5BIlMCxv2oM1XE2YWTJT0ndyh3kQDBhDC01kLE4PQiz9PE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707331410; c=relaxed/simple; bh=Nj1hfFsyjq6xs8JqMS+euEQwaY/7srUsVpEx0j3EMYE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=pBt8zU0k6flPx6S04G+IsOsJmsfK2vAawMgxBr4EbXK2HHkIi5Tgk5tPmCXgPtLjUO2swTIHwctlKA4TjKppmC2R8PyLFHOhQ2IhCGA8eLimmdK4zpIaI5tRowa7t9Ly0PIpao256POeFlkGaKcCRZZ7r4NK6qwoIytSExBcVso= 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 1rXmt8-0007UO-6s; Wed, 07 Feb 2024 19:43:14 +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 1rXmt5-0054XY-3P; Wed, 07 Feb 2024 19:43:11 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rXmt5-00HRsY-02; Wed, 07 Feb 2024 19:43:11 +0100 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: Mark Brown Cc: kernel@pengutronix.de, Miquel Raynal , Richard Weinberger , Vignesh Raghavendra , Rob Herring , Jonathan Cameron , Amit Kumar Mahapatra , Amit Kumar Mahapatra via Alsa-devel , linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 12/32] mtd: dataflash: Follow renaming of SPI "master" to "controller" Date: Wed, 7 Feb 2024 19:40:26 +0100 Message-ID: <38bf50b391c117621e406fa8cd00c4daef78615c.1707324794.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=1120; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=Nj1hfFsyjq6xs8JqMS+euEQwaY/7srUsVpEx0j3EMYE=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlw86jMqw4ltSTXwLQoh9w6paW5SuiO+i/OQP4/ aOSlb/Cxo6JATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZcPOowAKCRCPgPtYfRL+ TjrnCACykE5iNjuwUOalnLCibPbZzFNctipOmpqjUPC8qgwgD5BYLPLFNHhOX5G0Isz2+UbaG89 0AU2cfpxvSwpkFvt8Y0OkUYwClhioF+9d6lQ/qBoGXQ3VXQBlAB/L99vvk764QKk0dknR3ctVZn kNJi7XbxtiY8SWFYhs7xh/XQnKlb8spVTPs2P5XBok7m7S0FWuSVpQY8CWAvyucGjpEtSPYcxBc JE8tsv9mFFU3DGEPsy7l/9ZHo6yEjrinlOIpsESpd20SgfTKJ/8CuY28zfK58vmSCYy14oHgDGW jyuow/xCdY+iCtvbqNdMja+reRkwAfXFAxP8uaONYkVN5Ymt 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. Acked-by: Miquel Raynal Acked-by: Jonathan Cameron Signed-off-by: Uwe Kleine-K=C3=B6nig --- drivers/mtd/devices/mtd_dataflash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mtd/devices/mtd_dataflash.c b/drivers/mtd/devices/mtd_= dataflash.c index 0c1b93303618..ec52277e3dd5 100644 --- a/drivers/mtd/devices/mtd_dataflash.c +++ b/drivers/mtd/devices/mtd_dataflash.c @@ -638,7 +638,7 @@ static int add_dataflash_otp(struct spi_device *spi, ch= ar *name, int nr_pages, =20 /* name must be usable with cmdlinepart */ sprintf(priv->name, "spi%d.%d-%s", - spi->master->bus_num, spi_get_chipselect(spi, 0), + spi->controller->bus_num, spi_get_chipselect(spi, 0), name); =20 device =3D &priv->mtd; --=20 2.43.0 From nobody Thu Nov 14 04:56:27 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 34F7B85C64 for ; Wed, 7 Feb 2024 18:43:26 +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=1707331409; cv=none; b=ciAMmIlQNX/ra8kCoWKi26VPIcTvd4gwlQ5qBTVEPHFFtleRS1+HfcFUcPWh1jEfmsBbAc4eVLj25qBqwYHIGpNvLEguQOZjKeQolblDH/CU5nmiT/VdG558+1oqaWDS6MHZBWcHYrwRfJoyUCFQybod9hUG7V+HlcuJqmWA9G8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707331409; c=relaxed/simple; bh=mdwBi3Gt1cG0DX3WTfBzo1jaCcILClmPsuQWChC91NE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=fmcg8+oiv2Qii7pQ13JPzFFKRq8tIEFlqk3RZO+j9KaeZ5dg1HqamNm6qexblfvZlNU3wKW855LnLVXnjA3LmBptps9a1O8TnXLOauMBaQsEiE/cpb+i6U31t6GV6HuI5XkGUzoARfTGhMkUYN5o4Dic8YYZVua2UcQW7xScbxI= 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 1rXmt6-0007Wx-GE; Wed, 07 Feb 2024 19:43:12 +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 1rXmt5-0054Xb-Cj; Wed, 07 Feb 2024 19:43:11 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rXmt5-00HRsc-0y; Wed, 07 Feb 2024 19:43:11 +0100 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: Mark Brown Cc: kernel@pengutronix.de, "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Andy Shevchenko , Ulf Hansson , Ronald Wahl , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Jonathan Cameron Subject: [PATCH v3 13/32] net: ks8851: Follow renaming of SPI "master" to "controller" Date: Wed, 7 Feb 2024 19:40:27 +0100 Message-ID: <4f26761c0c86072a084b2a20439da1d0a681b07b.1707324794.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=1533; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=mdwBi3Gt1cG0DX3WTfBzo1jaCcILClmPsuQWChC91NE=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlw86k9EqMmy0LbIMCuyFFQLhB3tqOih4LKdVNG KI/UOAY1haJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZcPOpAAKCRCPgPtYfRL+ TmPxCACuusIwJoxvplewh7tp3xA8zp7Nt5arOfpSCDlr/xJ1JEFphV0FPRqpAvK5njlV8tTO7KG tB++GQjC/ToR8xZnCJj0+RTaGeLmXSaXjPwntEbITXOxfos/M68s6pEBVqcYwuBmfS4fSuICzTI iT6j4fT+Trobv2m/4azGbhXodf1oHuafhIasTvNM1tfonTjmW4o1xlF4Se1frJ240DBo5CQw2jf Eujd0cnILh6sVaOMV+4dMXeHD+FsJS0eDLYQF9ulAg5F1Tg/kr7JlgxJWGoGWpevE3Z+EevjJUz jIlZ5H6BNDeCYipiLNRcehw+tWIvmUadOkbqG2bI2AmkaCZQ 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. Reviewed-by: Simon Horman Acked-by: Jonathan Cameron Signed-off-by: Uwe Kleine-K=C3=B6nig --- drivers/net/ethernet/micrel/ks8851_spi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/micrel/ks8851_spi.c b/drivers/net/etherne= t/micrel/ks8851_spi.c index 54f2eac11a63..2f803377c9f9 100644 --- a/drivers/net/ethernet/micrel/ks8851_spi.c +++ b/drivers/net/ethernet/micrel/ks8851_spi.c @@ -156,7 +156,7 @@ static void ks8851_rdreg(struct ks8851_net *ks, unsigne= d int op, =20 txb[0] =3D cpu_to_le16(op | KS_SPIOP_RD); =20 - if (kss->spidev->master->flags & SPI_CONTROLLER_HALF_DUPLEX) { + if (kss->spidev->controller->flags & SPI_CONTROLLER_HALF_DUPLEX) { msg =3D &kss->spi_msg2; xfer =3D kss->spi_xfer2; =20 @@ -180,7 +180,7 @@ static void ks8851_rdreg(struct ks8851_net *ks, unsigne= d int op, ret =3D spi_sync(kss->spidev, msg); if (ret < 0) netdev_err(ks->netdev, "read: spi_sync() failed\n"); - else if (kss->spidev->master->flags & SPI_CONTROLLER_HALF_DUPLEX) + else if (kss->spidev->controller->flags & SPI_CONTROLLER_HALF_DUPLEX) memcpy(rxb, trx, rxl); else memcpy(rxb, trx + 2, rxl); --=20 2.43.0 From nobody Thu Nov 14 04:56:27 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 EA9FD85281 for ; Wed, 7 Feb 2024 18:43:26 +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=1707331411; cv=none; b=QFvTqLE78frNptwtQaK4eFbw+9D8iDU9ZynGjx8fBG8w1F+4J9UTwdYGroheKXRU8wjp6+e5EAz+yszQt5kW3YlTaC06LvhPvgydxhFkt0vrX8Y2J6hDmw0NDuEhXN3b+pFDwxPccRakHyIqCGS1D1cvr3GjGFZHiOQHQ4ciVuI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707331411; c=relaxed/simple; bh=Ev++aCx6/d1wDcv2MJFM1i0hfOpiN4a5Nl2m2PQoCTE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=gRGWxtwR6MAh0a4wg+IT6pkihwPQgAlxaWa6w31KpEpcWR+KHBzp0T2kvbkt7fKPjd2O1xnMcNBH3qqDm8nKI/KfYbE6V8DsHME/zcZty/ajCUewdDRb/t9dmNXxGPOhbtgskx7OFoXlbD3DSDOYNCkFGSc/t75+MZsAgsTmKVA= 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 1rXmt6-0007ag-HB; Wed, 07 Feb 2024 19:43:12 +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 1rXmt5-0054Xf-O1; Wed, 07 Feb 2024 19:43:11 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rXmt5-00HRsg-26; Wed, 07 Feb 2024 19:43:11 +0100 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: Mark Brown Cc: kernel@pengutronix.de, "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Jonathan Cameron , Simon Horman , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 14/32] net: vertexcom: mse102x: Follow renaming of SPI "master" to "controller" Date: Wed, 7 Feb 2024 19:40:28 +0100 Message-ID: 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=1148; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=Ev++aCx6/d1wDcv2MJFM1i0hfOpiN4a5Nl2m2PQoCTE=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlw86lVfFyg9pBoMFRnaLT01mJvefY9M/ZVZrT8 YfKGChibRyJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZcPOpQAKCRCPgPtYfRL+ TuJJB/406hU4AmOMOAe9HQg+TMU8xoT78Kq/OjYU65U9i95ZrB/WZLlnQ4y2S+udBxYeBIQmRLh cjtIv3qTJk4a/fLnPaxMs2TweEcl0dFwopgw34Tw2OpQIwtXmehUR2/xBOoY4WUDhmryJPLJlCQ 3PuX9o/qTo59i10zvC/MPugL6KP6DvHCiflEik+pNqvDRlo8PXODoZDg1z6pMjYkHy67+YuZ48p m8wZlbqoLgW3/HdPEt53C86ahFMfgPFXBHj6LCYLCjRz7NsmbsbwrjT0usOd0MsqhvM7YaTWGpB SRgJbHAxvcJ/HqIbCTGH4a7FZQtvwQNj0jEyhM/UqP7eYeps 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. Reviewed-by: Simon Horman Acked-by: Jonathan Cameron Signed-off-by: Uwe Kleine-K=C3=B6nig --- drivers/net/ethernet/vertexcom/mse102x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/vertexcom/mse102x.c b/drivers/net/etherne= t/vertexcom/mse102x.c index aeed2a093e34..edd8b59680e5 100644 --- a/drivers/net/ethernet/vertexcom/mse102x.c +++ b/drivers/net/ethernet/vertexcom/mse102x.c @@ -664,7 +664,7 @@ static int mse102x_probe_spi(struct spi_device *spi) spi->bits_per_word =3D 8; spi->mode |=3D SPI_MODE_3; /* enforce minimum speed to ensure device functionality */ - spi->master->min_speed_hz =3D MIN_FREQ_HZ; + spi->controller->min_speed_hz =3D MIN_FREQ_HZ; =20 if (!spi->max_speed_hz) spi->max_speed_hz =3D MAX_FREQ_HZ; --=20 2.43.0 From nobody Thu Nov 14 04:56:27 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 A73318564F for ; Wed, 7 Feb 2024 18:43:22 +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=Hzb5KfCvCFfEC6DoZgRLURScS887Qi+agdyTE/z3h74YkEjCQQg10BGy7Qozt5VCCwSB6gWQrpMea0B4KmBgbFDTWE0ELvSHVRHJD4z6UBVlevZ7mhGdpSVO4zrKmBkaADXWsLPydMnB6cqFTZumgqq/gA1f8q28oHdm6oHiHLs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707331405; c=relaxed/simple; bh=82BqdfYVCWT3Ohz5KyeQLipnBnJA3+PJw9sXj8PFqAY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=n/SDvWzL38dqGN/hePiEVo0v+CNGjLqT22hz2nSqQayEmzF6LkzlXAYkGMVNR89ga0WGozOowNytKup0wbWUzn0YC98BsMzzTRn0U/2CfJb60Dv036MIP3JK/6qbmeqBqF4mckBRTVfoAZJjpN22vGAL+mytKB7dYZl2bCd/qOI= 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 1rXmt7-0007eW-1z; Wed, 07 Feb 2024 19:43: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 1rXmt6-0054Xi-7q; Wed, 07 Feb 2024 19:43:12 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rXmt6-00HRsk-0V; Wed, 07 Feb 2024 19:43:12 +0100 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: Mark Brown Cc: kernel@pengutronix.de, Benson Leung , Tzung-Bi Shih , Guenter Roeck , chrome-platform@lists.linux.dev, linux-kernel@vger.kernel.org, Jonathan Cameron Subject: [PATCH v3 15/32] platform/chrome: cros_ec_spi: Follow renaming of SPI "master" to "controller" Date: Wed, 7 Feb 2024 19:40:29 +0100 Message-ID: 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=1899; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=82BqdfYVCWT3Ohz5KyeQLipnBnJA3+PJw9sXj8PFqAY=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlw86nU9GnftRL96TAXX7wsHrdPDZV8of/reV7I lhz81IJPcCJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZcPOpwAKCRCPgPtYfRL+ TnzPB/9dGwqLUtwjxbKxr2hjwVfulj2JlwzRozoJEw1LRWZfdHqEColaRC+wCKhfTDuKxqQi11T pMUWzpekGpc/lZ6nyKmBAVkMsWblZCLeSumNRC6lV2CKO32ZuOsYyW0gi5czelg7sTjD83hUfqL mHY2Cz1TPs/zcurJRPYBiKVUrcRqItQVgmIT+Rp4xmjadVAL+1lNGHdws0zWb+/fUweCk2voMpz eq75Str5OqwdudEpGZHm+qz3n//dpjtHpwjsFfQgOjrerEfz9fJF7KC34ycUjb6UqaEYmdTF3+w TP+PPbBqPef/qtRTbjBhq63kpGnXPB3blR8wdzP03/KCtUn6 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. Acked-by: Tzung-Bi Shih Acked-by: Jonathan Cameron Signed-off-by: Uwe Kleine-K=C3=B6nig --- drivers/platform/chrome/cros_ec_spi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/platform/chrome/cros_ec_spi.c b/drivers/platform/chrom= e/cros_ec_spi.c index 3e88cc92e819..86a3d32a7763 100644 --- a/drivers/platform/chrome/cros_ec_spi.c +++ b/drivers/platform/chrome/cros_ec_spi.c @@ -409,7 +409,7 @@ static int do_cros_ec_pkt_xfer_spi(struct cros_ec_devic= e *ec_dev, if (!rx_buf) return -ENOMEM; =20 - spi_bus_lock(ec_spi->spi->master); + spi_bus_lock(ec_spi->spi->controller); =20 /* * Leave a gap between CS assertion and clocking of data to allow the @@ -469,7 +469,7 @@ static int do_cros_ec_pkt_xfer_spi(struct cros_ec_devic= e *ec_dev, =20 final_ret =3D terminate_request(ec_dev); =20 - spi_bus_unlock(ec_spi->spi->master); + spi_bus_unlock(ec_spi->spi->controller); =20 if (!ret) ret =3D final_ret; @@ -554,7 +554,7 @@ static int do_cros_ec_cmd_xfer_spi(struct cros_ec_devic= e *ec_dev, if (!rx_buf) return -ENOMEM; =20 - spi_bus_lock(ec_spi->spi->master); + spi_bus_lock(ec_spi->spi->controller); =20 /* Transmit phase - send our message */ debug_packet(ec_dev->dev, "out", ec_dev->dout, len); @@ -590,7 +590,7 @@ static int do_cros_ec_cmd_xfer_spi(struct cros_ec_devic= e *ec_dev, =20 final_ret =3D terminate_request(ec_dev); =20 - spi_bus_unlock(ec_spi->spi->master); + spi_bus_unlock(ec_spi->spi->controller); =20 if (!ret) ret =3D final_ret; --=20 2.43.0 From nobody Thu Nov 14 04:56:27 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 B7F53127B4E 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=1707331407; cv=none; b=emazosLJdg6+6fHHQFDRiyGU5P73jyzunGYsMkL0n17AxOdKsQzxFgEKLS04bh5nLC/FEYX0wRwAmREtXVFCToNUQKUU5WN6in7ci55LwtZ463JgA7wOnW3iwoHj0Flpws+0muW0BPQsClCAWnmgmAHbsJWfMC19a90HurHUCX0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707331407; c=relaxed/simple; bh=QNjTOjgMkPoejERfadeuNwuWQefzL/dP2hf3G6y/d/M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=T3Z8aPUX+Hp/A3ixFhQtY9ZtRRjylWy18POux28hFQoQF5j1gtdT2uedHvdlR2TJ59raoluvlaqirX+HzMp7FExHw14XHOhqIGwfp0oV5UCerC3uEJ/dhpPOyiMwPpJZhOCb1XiyoBZE+pbD4Vj2fe9IVZxTuD7FiJy8jLxBeaQ= 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 1rXmt8-0007fL-6w; Wed, 07 Feb 2024 19:43:14 +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 1rXmt6-0054Xl-JM; Wed, 07 Feb 2024 19:43:12 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rXmt6-00HRso-1e; Wed, 07 Feb 2024 19:43:12 +0100 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: Mark Brown Cc: kernel@pengutronix.de, Michal Simek , Max Filippov , linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Jonathan Cameron Subject: [PATCH v3 16/32] spi: bitbang: Follow renaming of SPI "master" to "controller" Date: Wed, 7 Feb 2024 19:40:30 +0100 Message-ID: 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=18502; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=QNjTOjgMkPoejERfadeuNwuWQefzL/dP2hf3G6y/d/M=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlw86o12KC//K1c8+t4IU/1iD+0q2q9n9mycSL0 nVhRL6AJd6JATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZcPOqAAKCRCPgPtYfRL+ Tkn1CACWhZlQCNd1of+IQ7smnLXeKb58x88Chhk5hMftJSjNI8guZ+fbNBvRMFjFOevsPYZsKeN 426041IMthnCIvY+BciuSwbEwOlIoocQJHmhSvY7qhxtqZuFea6+wz8ot1dscyKpAP0kBYZXWao cVhGJNoPVc9wzBQ0uP44XWJ/KYD1/i9FT9Ww2+xojjM1FWPGLr92KDoGaRdt18brxDYd1QO0X3v ehomADEKbGm24BIb1eEbUAmZ3VGTZGm4F8sSOzng3kiDFPizoVjJ9a8Nf8ySMoaQbN+H0uv7I0D hhvywY0MEZDVbIAz3Sflt6jMU0oE1PmiU9/qf6gkq/JDpSH2 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 the SPI bitbang controller drivers. Acked-by: Jonathan Cameron Signed-off-by: Uwe Kleine-K=C3=B6nig --- drivers/spi/spi-ath79.c | 4 +-- drivers/spi/spi-au1550.c | 2 +- drivers/spi/spi-bitbang.c | 64 ++++++++++++++++----------------- drivers/spi/spi-butterfly.c | 6 ++-- drivers/spi/spi-davinci.c | 6 ++-- drivers/spi/spi-gpio.c | 2 +- drivers/spi/spi-lm70llp.c | 6 ++-- drivers/spi/spi-oc-tiny.c | 6 ++-- drivers/spi/spi-omap-uwire.c | 4 +-- drivers/spi/spi-sh-sci.c | 10 +++--- drivers/spi/spi-xilinx.c | 4 +-- drivers/spi/spi-xtensa-xtfpga.c | 2 +- include/linux/spi/spi_bitbang.h | 2 +- 13 files changed, 59 insertions(+), 59 deletions(-) diff --git a/drivers/spi/spi-ath79.c b/drivers/spi/spi-ath79.c index b7ada981464a..d78762d4db98 100644 --- a/drivers/spi/spi-ath79.c +++ b/drivers/spi/spi-ath79.c @@ -189,7 +189,7 @@ static int ath79_spi_probe(struct platform_device *pdev) host->num_chipselect =3D 3; host->mem_ops =3D &ath79_mem_ops; =20 - sp->bitbang.master =3D host; + sp->bitbang.ctlr =3D host; sp->bitbang.chipselect =3D ath79_spi_chipselect; sp->bitbang.txrx_word[SPI_MODE_0] =3D ath79_spi_txrx_mode0; sp->bitbang.flags =3D SPI_CS_HIGH; @@ -237,7 +237,7 @@ static void ath79_spi_remove(struct platform_device *pd= ev) =20 spi_bitbang_stop(&sp->bitbang); ath79_spi_disable(sp); - spi_controller_put(sp->bitbang.master); + spi_controller_put(sp->bitbang.ctlr); } =20 static void ath79_spi_shutdown(struct platform_device *pdev) diff --git a/drivers/spi/spi-au1550.c b/drivers/spi/spi-au1550.c index 1011b1a8f241..825d2f1cdff8 100644 --- a/drivers/spi/spi-au1550.c +++ b/drivers/spi/spi-au1550.c @@ -800,7 +800,7 @@ static int au1550_spi_probe(struct platform_device *pde= v) =20 init_completion(&hw->host_done); =20 - hw->bitbang.master =3D hw->host; + hw->bitbang.ctlr =3D hw->host; hw->bitbang.setup_transfer =3D au1550_spi_setupxfer; hw->bitbang.chipselect =3D au1550_spi_chipsel; hw->bitbang.txrx_bufs =3D au1550_spi_txrx_bufs; diff --git a/drivers/spi/spi-bitbang.c b/drivers/spi/spi-bitbang.c index ecd44016c197..a0e2204fc039 100644 --- a/drivers/spi/spi-bitbang.c +++ b/drivers/spi/spi-bitbang.c @@ -187,7 +187,7 @@ int spi_bitbang_setup(struct spi_device *spi) bool initial_setup =3D false; int retval; =20 - bitbang =3D spi_master_get_devdata(spi->master); + bitbang =3D spi_controller_get_devdata(spi->controller); =20 if (!cs) { cs =3D kzalloc(sizeof(*cs), GFP_KERNEL); @@ -236,7 +236,7 @@ static int spi_bitbang_bufs(struct spi_device *spi, str= uct spi_transfer *t) unsigned nsecs =3D cs->nsecs; struct spi_bitbang *bitbang; =20 - bitbang =3D spi_master_get_devdata(spi->master); + bitbang =3D spi_controller_get_devdata(spi->controller); if (bitbang->set_line_direction) { int err; =20 @@ -268,11 +268,11 @@ static int spi_bitbang_bufs(struct spi_device *spi, s= truct spi_transfer *t) * transfer-at-a-time ones to leverage dma or fifo hardware. */ =20 -static int spi_bitbang_prepare_hardware(struct spi_master *spi) +static int spi_bitbang_prepare_hardware(struct spi_controller *spi) { struct spi_bitbang *bitbang; =20 - bitbang =3D spi_master_get_devdata(spi); + bitbang =3D spi_controller_get_devdata(spi); =20 mutex_lock(&bitbang->lock); bitbang->busy =3D 1; @@ -281,11 +281,11 @@ static int spi_bitbang_prepare_hardware(struct spi_ma= ster *spi) return 0; } =20 -static int spi_bitbang_transfer_one(struct spi_master *master, +static int spi_bitbang_transfer_one(struct spi_controller *ctlr, struct spi_device *spi, struct spi_transfer *transfer) { - struct spi_bitbang *bitbang =3D spi_master_get_devdata(master); + struct spi_bitbang *bitbang =3D spi_controller_get_devdata(ctlr); int status =3D 0; =20 if (bitbang->setup_transfer) { @@ -303,16 +303,16 @@ static int spi_bitbang_transfer_one(struct spi_master= *master, status =3D -EREMOTEIO; =20 out: - spi_finalize_current_transfer(master); + spi_finalize_current_transfer(ctlr); =20 return status; } =20 -static int spi_bitbang_unprepare_hardware(struct spi_master *spi) +static int spi_bitbang_unprepare_hardware(struct spi_controller *spi) { struct spi_bitbang *bitbang; =20 - bitbang =3D spi_master_get_devdata(spi); + bitbang =3D spi_controller_get_devdata(spi); =20 mutex_lock(&bitbang->lock); bitbang->busy =3D 0; @@ -323,7 +323,7 @@ static int spi_bitbang_unprepare_hardware(struct spi_ma= ster *spi) =20 static void spi_bitbang_set_cs(struct spi_device *spi, bool enable) { - struct spi_bitbang *bitbang =3D spi_master_get_devdata(spi->master); + struct spi_bitbang *bitbang =3D spi_controller_get_devdata(spi->controlle= r); =20 /* SPI core provides CS high / low, but bitbang driver * expects CS active @@ -341,10 +341,10 @@ static void spi_bitbang_set_cs(struct spi_device *spi= , bool enable) =20 int spi_bitbang_init(struct spi_bitbang *bitbang) { - struct spi_master *master =3D bitbang->master; + struct spi_controller *ctlr =3D bitbang->ctlr; bool custom_cs; =20 - if (!master) + if (!ctlr) return -EINVAL; /* * We only need the chipselect callback if we are actually using it. @@ -352,39 +352,39 @@ int spi_bitbang_init(struct spi_bitbang *bitbang) * SPI_CONTROLLER_GPIO_SS flag is set, we always need to call the * driver-specific chipselect routine. */ - custom_cs =3D (!master->use_gpio_descriptors || - (master->flags & SPI_CONTROLLER_GPIO_SS)); + custom_cs =3D (!ctlr->use_gpio_descriptors || + (ctlr->flags & SPI_CONTROLLER_GPIO_SS)); =20 if (custom_cs && !bitbang->chipselect) return -EINVAL; =20 mutex_init(&bitbang->lock); =20 - if (!master->mode_bits) - master->mode_bits =3D SPI_CPOL | SPI_CPHA | bitbang->flags; + if (!ctlr->mode_bits) + ctlr->mode_bits =3D SPI_CPOL | SPI_CPHA | bitbang->flags; =20 - if (master->transfer || master->transfer_one_message) + if (ctlr->transfer || ctlr->transfer_one_message) return -EINVAL; =20 - master->prepare_transfer_hardware =3D spi_bitbang_prepare_hardware; - master->unprepare_transfer_hardware =3D spi_bitbang_unprepare_hardware; - master->transfer_one =3D spi_bitbang_transfer_one; + ctlr->prepare_transfer_hardware =3D spi_bitbang_prepare_hardware; + ctlr->unprepare_transfer_hardware =3D spi_bitbang_unprepare_hardware; + ctlr->transfer_one =3D spi_bitbang_transfer_one; /* * When using GPIO descriptors, the ->set_cs() callback doesn't even * get called unless SPI_CONTROLLER_GPIO_SS is set. */ if (custom_cs) - master->set_cs =3D spi_bitbang_set_cs; + ctlr->set_cs =3D spi_bitbang_set_cs; =20 if (!bitbang->txrx_bufs) { bitbang->use_dma =3D 0; bitbang->txrx_bufs =3D spi_bitbang_bufs; - if (!master->setup) { + if (!ctlr->setup) { if (!bitbang->setup_transfer) bitbang->setup_transfer =3D spi_bitbang_setup_transfer; - master->setup =3D spi_bitbang_setup; - master->cleanup =3D spi_bitbang_cleanup; + ctlr->setup =3D spi_bitbang_setup; + ctlr->cleanup =3D spi_bitbang_cleanup; } } =20 @@ -411,18 +411,18 @@ EXPORT_SYMBOL_GPL(spi_bitbang_init); * master methods. Those methods are the defaults if the bitbang->txrx_bu= fs * routine isn't initialized. * - * This routine registers the spi_master, which will process requests in a + * This routine registers the spi_controller, which will process requests = in a * dedicated task, keeping IRQs unblocked most of the time. To stop * processing those requests, call spi_bitbang_stop(). * - * On success, this routine will take a reference to master. The caller is - * responsible for calling spi_bitbang_stop() to decrement the reference a= nd - * spi_master_put() as counterpart of spi_alloc_master() to prevent a memo= ry + * On success, this routine will take a reference to the controller. The c= aller + * is responsible for calling spi_bitbang_stop() to decrement the referenc= e and + * spi_controller_put() as counterpart of spi_alloc_master() to prevent a = memory * leak. */ int spi_bitbang_start(struct spi_bitbang *bitbang) { - struct spi_master *master =3D bitbang->master; + struct spi_controller *ctlr =3D bitbang->ctlr; int ret; =20 ret =3D spi_bitbang_init(bitbang); @@ -432,9 +432,9 @@ int spi_bitbang_start(struct spi_bitbang *bitbang) /* driver may get busy before register() returns, especially * if someone registered boardinfo for devices */ - ret =3D spi_register_master(spi_master_get(master)); + ret =3D spi_register_controller(spi_controller_get(ctlr)); if (ret) - spi_master_put(master); + spi_controller_put(ctlr); =20 return ret; } @@ -445,7 +445,7 @@ EXPORT_SYMBOL_GPL(spi_bitbang_start); */ void spi_bitbang_stop(struct spi_bitbang *bitbang) { - spi_unregister_master(bitbang->master); + spi_unregister_controller(bitbang->ctlr); } EXPORT_SYMBOL_GPL(spi_bitbang_stop); =20 diff --git a/drivers/spi/spi-butterfly.c b/drivers/spi/spi-butterfly.c index 289b4454242a..1d267e6c22a4 100644 --- a/drivers/spi/spi-butterfly.c +++ b/drivers/spi/spi-butterfly.c @@ -205,7 +205,7 @@ static void butterfly_attach(struct parport *p) host->bus_num =3D 42; host->num_chipselect =3D 2; =20 - pp->bitbang.master =3D host; + pp->bitbang.ctlr =3D host; pp->bitbang.chipselect =3D butterfly_chipselect; pp->bitbang.txrx_word[SPI_MODE_0] =3D butterfly_txrx_word_mode0; =20 @@ -263,7 +263,7 @@ static void butterfly_attach(struct parport *p) pp->info[0].platform_data =3D &flash; pp->info[0].chip_select =3D 1; pp->info[0].controller_data =3D pp; - pp->dataflash =3D spi_new_device(pp->bitbang.master, &pp->info[0]); + pp->dataflash =3D spi_new_device(pp->bitbang.ctlr, &pp->info[0]); if (pp->dataflash) pr_debug("%s: dataflash at %s\n", p->name, dev_name(&pp->dataflash->dev)); @@ -308,7 +308,7 @@ static void butterfly_detach(struct parport *p) parport_release(pp->pd); parport_unregister_device(pp->pd); =20 - spi_controller_put(pp->bitbang.master); + spi_controller_put(pp->bitbang.ctlr); } =20 static struct parport_driver butterfly_driver =3D { diff --git a/drivers/spi/spi-davinci.c b/drivers/spi/spi-davinci.c index 5688be245c68..be3998104bfb 100644 --- a/drivers/spi/spi-davinci.c +++ b/drivers/spi/spi-davinci.c @@ -459,7 +459,7 @@ static bool davinci_spi_can_dma(struct spi_controller *= host, =20 static int davinci_spi_check_error(struct davinci_spi *dspi, int int_statu= s) { - struct device *sdev =3D dspi->bitbang.master->dev.parent; + struct device *sdev =3D dspi->bitbang.ctlr->dev.parent; =20 if (int_status & SPIFLG_TIMEOUT_MASK) { dev_err(sdev, "SPI Time-out Error\n"); @@ -742,7 +742,7 @@ static irqreturn_t davinci_spi_irq(s32 irq, void *data) =20 static int davinci_spi_request_dma(struct davinci_spi *dspi) { - struct device *sdev =3D dspi->bitbang.master->dev.parent; + struct device *sdev =3D dspi->bitbang.ctlr->dev.parent; =20 dspi->dma_rx =3D dma_request_chan(sdev, "rx"); if (IS_ERR(dspi->dma_rx)) @@ -913,7 +913,7 @@ static int davinci_spi_probe(struct platform_device *pd= ev) if (ret) goto free_host; =20 - dspi->bitbang.master =3D host; + dspi->bitbang.ctlr =3D host; =20 dspi->clk =3D devm_clk_get_enabled(&pdev->dev, NULL); if (IS_ERR(dspi->clk)) { diff --git a/drivers/spi/spi-gpio.c b/drivers/spi/spi-gpio.c index d8db4564b406..909cce109bba 100644 --- a/drivers/spi/spi-gpio.c +++ b/drivers/spi/spi-gpio.c @@ -427,7 +427,7 @@ static int spi_gpio_probe(struct platform_device *pdev) host->cleanup =3D spi_gpio_cleanup; =20 bb =3D &spi_gpio->bitbang; - bb->master =3D host; + bb->ctlr =3D host; /* * There is some additional business, apart from driving the CS GPIO * line, that we need to do on selection. This makes the local diff --git a/drivers/spi/spi-lm70llp.c b/drivers/spi/spi-lm70llp.c index e6a65b5c8c31..f982bdebd028 100644 --- a/drivers/spi/spi-lm70llp.c +++ b/drivers/spi/spi-lm70llp.c @@ -212,7 +212,7 @@ static void spi_lm70llp_attach(struct parport *p) /* * SPI and bitbang hookup. */ - pp->bitbang.master =3D host; + pp->bitbang.ctlr =3D host; pp->bitbang.chipselect =3D lm70_chipselect; pp->bitbang.txrx_word[SPI_MODE_0] =3D lm70_txrx; pp->bitbang.flags =3D SPI_3WIRE; @@ -264,7 +264,7 @@ static void spi_lm70llp_attach(struct parport *p) * the board info's (void *)controller_data. */ pp->info.controller_data =3D pp; - pp->spidev_lm70 =3D spi_new_device(pp->bitbang.master, &pp->info); + pp->spidev_lm70 =3D spi_new_device(pp->bitbang.ctlr, &pp->info); if (pp->spidev_lm70) dev_dbg(&pp->spidev_lm70->dev, "spidev_lm70 at %s\n", dev_name(&pp->spidev_lm70->dev)); @@ -309,7 +309,7 @@ static void spi_lm70llp_detach(struct parport *p) parport_release(pp->pd); parport_unregister_device(pp->pd); =20 - spi_controller_put(pp->bitbang.master); + spi_controller_put(pp->bitbang.ctlr); =20 lm70llp =3D NULL; } diff --git a/drivers/spi/spi-oc-tiny.c b/drivers/spi/spi-oc-tiny.c index cf7c111088a6..6ea38f5e7d64 100644 --- a/drivers/spi/spi-oc-tiny.c +++ b/drivers/spi/spi-oc-tiny.c @@ -194,7 +194,7 @@ static int tiny_spi_of_probe(struct platform_device *pd= ev) =20 if (!np) return 0; - hw->bitbang.master->dev.of_node =3D pdev->dev.of_node; + hw->bitbang.ctlr->dev.of_node =3D pdev->dev.of_node; if (!of_property_read_u32(np, "clock-frequency", &val)) hw->freq =3D val; if (!of_property_read_u32(np, "baud-width", &val)) @@ -229,7 +229,7 @@ static int tiny_spi_probe(struct platform_device *pdev) platform_set_drvdata(pdev, hw); =20 /* setup the state for the bitbang driver */ - hw->bitbang.master =3D host; + hw->bitbang.ctlr =3D host; hw->bitbang.setup_transfer =3D tiny_spi_setup_transfer; hw->bitbang.txrx_bufs =3D tiny_spi_txrx_bufs; =20 @@ -274,7 +274,7 @@ static int tiny_spi_probe(struct platform_device *pdev) static void tiny_spi_remove(struct platform_device *pdev) { struct tiny_spi *hw =3D platform_get_drvdata(pdev); - struct spi_controller *host =3D hw->bitbang.master; + struct spi_controller *host =3D hw->bitbang.ctlr; =20 spi_bitbang_stop(&hw->bitbang); spi_controller_put(host); diff --git a/drivers/spi/spi-omap-uwire.c b/drivers/spi/spi-omap-uwire.c index 2dd1c1bcf4bf..210a98d903fa 100644 --- a/drivers/spi/spi-omap-uwire.c +++ b/drivers/spi/spi-omap-uwire.c @@ -448,7 +448,7 @@ static void uwire_off(struct uwire_spi *uwire) { uwire_write_reg(UWIRE_SR3, 0); clk_disable_unprepare(uwire->ck); - spi_controller_put(uwire->bitbang.master); + spi_controller_put(uwire->bitbang.ctlr); } =20 static int uwire_probe(struct platform_device *pdev) @@ -493,7 +493,7 @@ static int uwire_probe(struct platform_device *pdev) host->setup =3D uwire_setup; host->cleanup =3D uwire_cleanup; =20 - uwire->bitbang.master =3D host; + uwire->bitbang.ctlr =3D host; uwire->bitbang.chipselect =3D uwire_chipselect; uwire->bitbang.setup_transfer =3D uwire_setup_transfer; uwire->bitbang.txrx_bufs =3D uwire_txrx; diff --git a/drivers/spi/spi-sh-sci.c b/drivers/spi/spi-sh-sci.c index 148d615d2f38..3d560b154ad3 100644 --- a/drivers/spi/spi-sh-sci.c +++ b/drivers/spi/spi-sh-sci.c @@ -136,9 +136,9 @@ static int sh_sci_spi_probe(struct platform_device *dev) } =20 /* setup spi bitbang adaptor */ - sp->bitbang.master =3D host; - sp->bitbang.master->bus_num =3D sp->info->bus_num; - sp->bitbang.master->num_chipselect =3D sp->info->num_chipselect; + sp->bitbang.ctlr =3D host; + sp->bitbang.ctlr->bus_num =3D sp->info->bus_num; + sp->bitbang.ctlr->num_chipselect =3D sp->info->num_chipselect; sp->bitbang.chipselect =3D sh_sci_spi_chipselect; =20 sp->bitbang.txrx_word[SPI_MODE_0] =3D sh_sci_spi_txrx_mode0; @@ -166,7 +166,7 @@ static int sh_sci_spi_probe(struct platform_device *dev) setbits(sp, PIN_INIT, 0); iounmap(sp->membase); err1: - spi_controller_put(sp->bitbang.master); + spi_controller_put(sp->bitbang.ctlr); err0: return ret; } @@ -178,7 +178,7 @@ static void sh_sci_spi_remove(struct platform_device *d= ev) spi_bitbang_stop(&sp->bitbang); setbits(sp, PIN_INIT, 0); iounmap(sp->membase); - spi_controller_put(sp->bitbang.master); + spi_controller_put(sp->bitbang.ctlr); } =20 static struct platform_driver sh_sci_spi_drv =3D { diff --git a/drivers/spi/spi-xilinx.c b/drivers/spi/spi-xilinx.c index 12355957be97..7795328427a6 100644 --- a/drivers/spi/spi-xilinx.c +++ b/drivers/spi/spi-xilinx.c @@ -434,7 +434,7 @@ static int xilinx_spi_probe(struct platform_device *pde= v) =20 xspi =3D spi_controller_get_devdata(host); xspi->cs_inactive =3D 0xffffffff; - xspi->bitbang.master =3D host; + xspi->bitbang.ctlr =3D host; xspi->bitbang.chipselect =3D xilinx_spi_chipselect; xspi->bitbang.setup_transfer =3D xilinx_spi_setup_transfer; xspi->bitbang.txrx_bufs =3D xilinx_spi_txrx_bufs; @@ -516,7 +516,7 @@ static void xilinx_spi_remove(struct platform_device *p= dev) /* Disable the global IPIF interrupt */ xspi->write_fn(0, regs_base + XIPIF_V123B_DGIER_OFFSET); =20 - spi_controller_put(xspi->bitbang.master); + spi_controller_put(xspi->bitbang.ctlr); } =20 /* work with hotplug and coldplug */ diff --git a/drivers/spi/spi-xtensa-xtfpga.c b/drivers/spi/spi-xtensa-xtfpg= a.c index 3c7721894376..3c2cda315397 100644 --- a/drivers/spi/spi-xtensa-xtfpga.c +++ b/drivers/spi/spi-xtensa-xtfpga.c @@ -93,7 +93,7 @@ static int xtfpga_spi_probe(struct platform_device *pdev) host->dev.of_node =3D pdev->dev.of_node; =20 xspi =3D spi_controller_get_devdata(host); - xspi->bitbang.master =3D host; + xspi->bitbang.ctlr =3D host; xspi->bitbang.chipselect =3D xtfpga_spi_chipselect; xspi->bitbang.txrx_word[SPI_MODE_0] =3D xtfpga_spi_txrx_word; xspi->regs =3D devm_platform_ioremap_resource(pdev, 0); diff --git a/include/linux/spi/spi_bitbang.h b/include/linux/spi/spi_bitban= g.h index 4444c2a992cb..b930eca2ef7b 100644 --- a/include/linux/spi/spi_bitbang.h +++ b/include/linux/spi/spi_bitbang.h @@ -10,7 +10,7 @@ struct spi_bitbang { u8 use_dma; u16 flags; /* extra spi->mode support */ =20 - struct spi_master *master; + struct spi_controller *ctlr; =20 /* setup_transfer() changes clock and/or wordsize to match settings * for this transfer; zeroes restore defaults from spi_device. --=20 2.43.0 From nobody Thu Nov 14 04:56:27 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 F209585281 for ; Wed, 7 Feb 2024 18:43:18 +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=1707331400; cv=none; b=sfqZDgu02quTZaf1OgbqWuA86lRak40Tn8eITKp0Rem6oeXPanDsfqcsLdCBW9IEhdWNrdDt7iM+dG7GNFy6NfV8pnOyiy+TZlbo0b/rlZDs3ZmhRCZ4uHMABEshxFZYUU3plNLdjKCmYHzDyTqEOHuViRHU8K+x91IhUlYGi+4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707331400; c=relaxed/simple; bh=JgBVUlN1d7qYFnm0ZKVPd582aguOzqNX2Ijr5H69uZY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=L9UchSFyh4UGl5bKnqaIZNYbmTJWlQ7If27OYgGZkvtrSzdPIDkBQNvbVNWXNcKKxnBY8fXYFJj8bPY6uOpIBwZpBMKL50CMXTXaUpTiiW7Oh/Z0HX8IdAoW5/Ws4VjMLH3kdnN+CGQg07HN32PD3AgAWdTJZc4B4mpKUHm/maE= 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 1rXmt7-0007iL-Hm; Wed, 07 Feb 2024 19:43: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 1rXmt7-0054Xq-1P; Wed, 07 Feb 2024 19:43:13 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rXmt6-00HRss-36; Wed, 07 Feb 2024 19:43:12 +0100 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: Mark Brown Cc: kernel@pengutronix.de, linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Jonathan Cameron Subject: [PATCH v3 17/32] spi: cadence-quadspi: Don't emit error message on allocation error Date: Wed, 7 Feb 2024 19:40:31 +0100 Message-ID: <8da90785395664bf17d16428f46e84b95ef5cc3b.1707324794.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=977; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=JgBVUlN1d7qYFnm0ZKVPd582aguOzqNX2Ijr5H69uZY=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlw86pp9uzxmuDyQ0mFGdNd2DpAvbKt7gfjHNv9 bKDArohENOJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZcPOqQAKCRCPgPtYfRL+ TuIlB/9IqxAwKlOkz/l+TR7Hb1usnQ7iK++5ehWAYDu/QUDiAb0Yl6oDxx1gkrkZoMLbBbVL8ZZ HZ2aSBvGj/+pdWAEzqQiRLKWaOnlmljb9ZUigfxDM6ncvtG30HQ7kiQ1qizjLR+4diCVKZsR1Md fGAfxverac0tyFjzbeCouufNq/jVaDgEvLMpgp19kIz4IMGODU8wcTHr+/wWD9HbzZLeVo8LNYx EeQdKkrVAkOdnpay8fJ9nfaZAFUySgRpBRETYDKjauJ8Vtc7d0ifrcVHE2/auIeHfeC1kMcGFeX 5nJz+ea84Omsw9yoUs5bwsTeEzWUHJG0NLjokzF7tUN2MARp 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 Drivers are not supposed to emit an error message when a memory allocation fails, as the kernel is very loud in this case already anyhow. Acked-by: Jonathan Cameron Signed-off-by: Uwe Kleine-K=C3=B6nig --- drivers/spi/spi-cadence-quadspi.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/spi/spi-cadence-quadspi.c b/drivers/spi/spi-cadence-qu= adspi.c index f94e0d370d46..eb6cc861b00b 100644 --- a/drivers/spi/spi-cadence-quadspi.c +++ b/drivers/spi/spi-cadence-quadspi.c @@ -1712,10 +1712,9 @@ static int cqspi_probe(struct platform_device *pdev) int irq; =20 host =3D devm_spi_alloc_host(&pdev->dev, sizeof(*cqspi)); - if (!host) { - dev_err(&pdev->dev, "devm_spi_alloc_host failed\n"); + if (!host) return -ENOMEM; - } + host->mode_bits =3D SPI_RX_QUAD | SPI_RX_DUAL; host->mem_ops =3D &cqspi_mem_ops; host->mem_caps =3D &cqspi_mem_caps; --=20 2.43.0 From nobody Thu Nov 14 04:56:27 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 11F4885943 for ; Wed, 7 Feb 2024 18:43:20 +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=1707331403; cv=none; b=E7KSLVucSaw35hxl7nlIEOMIz8Hba1sUjk2aevl+6tzFDJG9erKlT/G95vK/lBEFVn4Bi7hLeU2ar2fJWkOEhRKCPbpJx0EsWSeNY9Q3D95ZiEytaXcIhJ+bIG2xtMYzfE2RFTCRrFGIsKf3k/+a+wkFML1PAZHNi13a+qoUDRQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707331403; c=relaxed/simple; bh=RbOvDVmurbfANfv8VPt3j5rWCMBhT6rMxR0v2GBXhN4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=uREZ7UEPYSfEju4UvlTpWl0ozB4lUpDSZ5RetMVMe0K/kfKxPPzhdALRIbiValIqheA7lUEaeVV1UduQ+5KTXekUfq7EB5g7XzuRsVjzGoLthE25YVa8/4d9eVZV9VEakJlU0cVlCYdH19Spxt4GgSMEwMQMb+RgKtGeVbM7U/I= 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 1rXmt9-0007mI-Eo; Wed, 07 Feb 2024 19:43: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 1rXmt9-0054Xx-2G; Wed, 07 Feb 2024 19:43:15 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rXmt8-00HRsw-3B; Wed, 07 Feb 2024 19:43:14 +0100 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: Mark Brown Cc: kernel@pengutronix.de, linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Jonathan Cameron Subject: [PATCH v3 18/32] spi: cadence-quadspi: Follow renaming of SPI "master" to "controller" Date: Wed, 7 Feb 2024 19:40:32 +0100 Message-ID: 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=1151; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=RbOvDVmurbfANfv8VPt3j5rWCMBhT6rMxR0v2GBXhN4=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlw86qP+LJktb5dkl7rbmpmK/xxovvRS6CdS4pc qKGLZfaToCJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZcPOqgAKCRCPgPtYfRL+ TgPICACEOB9h8aDM2Y6v2EVwZJouk5eaWTzwY3r62EzHehblZh3eWE8hbMVE4ggfzLMWsCh8nZ4 hwrXvjFYzSrS9knpA0IlE5CjRWPIpggKClkKWH69BllfWdHFRsRKDQ80Ng4IFpsos4ye19+/49T wplWugZUQYfyiJdoOtiMMJZqTN2gURsUli8soUDoIZWpd536oujqrhOgtFISveiWNBXmohzD9qO 71OInPWc7QkUWGXT5d16jndIpWhVJA9WarVwNnj2bpOq2jhVZdMPLly3VIKRMmMOPqS1romHIFC E5+IWGxVDmaV6MPQ7jQn2fQ/QW81p2X0F61RL9rLCGRa1uyN 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. Acked-by: Jonathan Cameron Signed-off-by: Uwe Kleine-K=C3=B6nig --- drivers/spi/spi-cadence-quadspi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/spi/spi-cadence-quadspi.c b/drivers/spi/spi-cadence-qu= adspi.c index eb6cc861b00b..a5e2f7786b76 100644 --- a/drivers/spi/spi-cadence-quadspi.c +++ b/drivers/spi/spi-cadence-quadspi.c @@ -1410,7 +1410,7 @@ static int cqspi_mem_process(struct spi_mem *mem, con= st struct spi_mem_op *op) static int cqspi_exec_mem_op(struct spi_mem *mem, const struct spi_mem_op = *op) { int ret; - struct cqspi_st *cqspi =3D spi_master_get_devdata(mem->spi->master); + struct cqspi_st *cqspi =3D spi_controller_get_devdata(mem->spi->controlle= r); struct device *dev =3D &cqspi->pdev->dev; =20 ret =3D pm_runtime_resume_and_get(dev); --=20 2.43.0 From nobody Thu Nov 14 04:56:27 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 1E6DE85953 for ; Wed, 7 Feb 2024 18:43:20 +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=1707331403; cv=none; b=UxRdQqdt9dGlVXkvq1jhdI5vTvOm2aO2nnQ+kGGrdEXsBdrLsSgsagILEGRapkhqJfcv77ZvXA9Ji3WkkCRLDsr1gK3hCn8IwCk6E28Tz9wpwUkUDEJJXnHzW9cibxfDmgjV7eL2oNPBr26A0/1vVfbPAPTEp2LMzbGkENjaY9I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707331403; c=relaxed/simple; bh=4wYu7Xc9eR22LmfUrJP6PrWGCG5RVj4kh+07Xr06lbI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=pDdYLhwGIqM0TxHXelF3ItHhXPEBV+aC2+xfzAavvbwIB2DdDj7Nz5t9IChFoaIrrGNBEx8TXE2jVuluT/AnGCsRPZ7ll5xhhOzWkuQNckTQEnlG4nWYF3rvd1NF5cEL+nRsoJz8fneVfcT94i6gBRaO331WxAaVhoDw8c4Jafg= 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 1rXmt9-0007mU-RQ; Wed, 07 Feb 2024 19:43: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 1rXmt9-0054Y0-Ee; Wed, 07 Feb 2024 19:43:15 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rXmt9-00HRt0-1B; Wed, 07 Feb 2024 19:43:15 +0100 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: Mark Brown Cc: kernel@pengutronix.de, linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Jonathan Cameron Subject: [PATCH v3 19/32] spi: cavium: Follow renaming of SPI "master" to "controller" Date: Wed, 7 Feb 2024 19:40:33 +0100 Message-ID: <8aa122cffa6c8c18cc3367def872f81cd9471f2a.1707324794.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=1944; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=4wYu7Xc9eR22LmfUrJP6PrWGCG5RVj4kh+07Xr06lbI=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlw86wqlDvFCYYlimi5Xl/f9sNAl28lWhxwDESB PRBb6RZCTeJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZcPOsAAKCRCPgPtYfRL+ TlhwB/9wJIDWQA6DRjbZ+vEgqOeuVDb9PtgXaQbpGYxCmht57WivI7IxbP70onTdaPX9Tt38Q+9 1CL8hB3Ra7mt4yKam5rQv82KhgAoVOQ9Hqkz78xIeJqk+7LvaX9xQ7nvXUWbtkaJ98M0C9FroLP /dHAQfRw43WFG/g1hE8MNpccYMADgnBDN6EEzkUd7h9n2nhAv000NH6gb50ZjZ1Zmo7/4p74VQO H1igC/trEgoSvPE0FJ1DQrFTP3F8H0IbmuYPNKplCabuhHGYSG/jBwCK2W9CSDn74a3mBKlGQBa U+A5XG/HhiZG/w87bMmoPxo10ZGuli7xDcqAwm8bXX+mRh7v 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. Acked-by: Jonathan Cameron Signed-off-by: Uwe Kleine-K=C3=B6nig --- drivers/spi/spi-cavium.c | 6 +++--- drivers/spi/spi-cavium.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/spi/spi-cavium.c b/drivers/spi/spi-cavium.c index dfe224defd6e..26b8cd1c76e1 100644 --- a/drivers/spi/spi-cavium.c +++ b/drivers/spi/spi-cavium.c @@ -124,10 +124,10 @@ static int octeon_spi_do_transfer(struct octeon_spi *= p, return xfer->len; } =20 -int octeon_spi_transfer_one_message(struct spi_master *master, +int octeon_spi_transfer_one_message(struct spi_controller *ctlr, struct spi_message *msg) { - struct octeon_spi *p =3D spi_master_get_devdata(master); + struct octeon_spi *p =3D spi_controller_get_devdata(ctlr); unsigned int total_len =3D 0; int status =3D 0; struct spi_transfer *xfer; @@ -145,6 +145,6 @@ int octeon_spi_transfer_one_message(struct spi_master *= master, err: msg->status =3D status; msg->actual_length =3D total_len; - spi_finalize_current_message(master); + spi_finalize_current_message(ctlr); return status; } diff --git a/drivers/spi/spi-cavium.h b/drivers/spi/spi-cavium.h index 1f3ac463a20b..af53a0c31476 100644 --- a/drivers/spi/spi-cavium.h +++ b/drivers/spi/spi-cavium.h @@ -28,7 +28,7 @@ struct octeon_spi { #define OCTEON_SPI_TX(x) (x->regs.tx) #define OCTEON_SPI_DAT0(x) (x->regs.data) =20 -int octeon_spi_transfer_one_message(struct spi_master *master, +int octeon_spi_transfer_one_message(struct spi_controller *ctlr, struct spi_message *msg); =20 /* MPI register descriptions */ --=20 2.43.0 From nobody Thu Nov 14 04:56:27 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 07381129A62 for ; Wed, 7 Feb 2024 18:43:26 +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=1707331409; cv=none; b=DiKK3IoAJL3UrFMBtSwoWIDTkrGLHurzp+53NzMl1qZ/KJcAccp+Xwr17K/0uVHhjoDFQYrILpoBi8yGNIvPm3jNi7qwm9LIXCJmGAZdKd+0TUYaUzi8C47Kb6vcAhUwBmsKqmuSK7anm2ZzMTrMbvYt4EhlenaBin4pjewijXk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707331409; c=relaxed/simple; bh=sedoM7CcQ8yhtvlljO6KHXwExG+ci9r0NNv85ipsCl8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=QTX/vSjSV56ym3+ChrLFoMb5HXNqFE3zQq5kzEoZI72HnPxjSricFvIZ0NlyN2axnsb+F45weRsTMh72p+qUiNXzawsUT8UasqgZwkXixke4xjgYqzf4A9JGFCHk1botxcM9/I1eg2NhfgnAsWEz5LZQi7JPK+HbbKGUoor01Ng= 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 1rXmtA-0007mb-4g; Wed, 07 Feb 2024 19:43:16 +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 1rXmt9-0054Y4-O6; Wed, 07 Feb 2024 19:43:15 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rXmt9-00HRt4-29; Wed, 07 Feb 2024 19:43:15 +0100 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: Mark Brown Cc: kernel@pengutronix.de, Bjorn Andersson , Konrad Dybcio , linux-arm-msm@vger.kernel.org, linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Jonathan Cameron Subject: [PATCH v3 20/32] spi: geni-qcom: Follow renaming of SPI "master" to "controller" Date: Wed, 7 Feb 2024 19:40:34 +0100 Message-ID: <895f9a42691dcea037b30dcce5e61be0b44e3a25.1707324794.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=1199; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=sedoM7CcQ8yhtvlljO6KHXwExG+ci9r0NNv85ipsCl8=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlw86xAk1vvboMlXWACn8sl31yuENXIP7NREKjb lCzErfnaq6JATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZcPOsQAKCRCPgPtYfRL+ Tq2uB/wIpbY6Y0vKbaPylLEMNFlZogoOP/fMCAFoGCAFhQU74nd6pLUmsqiFgJbs2VZ61KypDvL UDcQ8Ir3EDF2fseBjbdSb0Kj86jTopRJzfnjtzjuerGhrXWi3kzmSr0wfbl44n6nY/Z/AyeJXmn bpNw7Hn2uN6RZyQxEZ7z5OhQ5ylTEDwbTuRsvD407knRpm3xT+KCHg+151Ls55fnbbME4l39Spu 8jdNCVJwHUVtUAIAX9W4Uqv3MSFv0eQdUwifDB8kLllhTpC0GV8LSL5XZ6SkVyMC7reON8v5ohg at0IhQuOOOTINYb8eaRfE7BtBUtSF3XMRjFISyo4naNawlnU 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. This was already tried before in commit 8726bdcef62e ("spi: geni-qcom: switch to use modern name"), that's why this change is so small. Acked-by: Jonathan Cameron Signed-off-by: Uwe Kleine-K=C3=B6nig --- drivers/spi/spi-geni-qcom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/spi/spi-geni-qcom.c b/drivers/spi/spi-geni-qcom.c index 15f84e68d4d2..37ef8c40b276 100644 --- a/drivers/spi/spi-geni-qcom.c +++ b/drivers/spi/spi-geni-qcom.c @@ -647,7 +647,7 @@ static void spi_geni_release_dma_chan(struct spi_geni_m= aster *mas) =20 static int spi_geni_init(struct spi_geni_master *mas) { - struct spi_master *spi =3D dev_get_drvdata(mas->dev); + struct spi_controller *spi =3D dev_get_drvdata(mas->dev); struct geni_se *se =3D &mas->se; unsigned int proto, major, minor, ver; u32 spi_tx_cfg, fifo_disable; --=20 2.43.0 From nobody Thu Nov 14 04:56:27 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 EE98285C4F for ; Wed, 7 Feb 2024 18:43: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=1707331404; cv=none; b=ItN5F9Hwo6G5DMoX5oyis/S2YnGn8767+qImG8XyM9T1NZ6uKYrZ9ekMf4S+2lruK+OQ/gJv5l9cuofslCzLChMjXRAgscZfORX7KhaYjDKC7w6zINtISKptMK3B+SLaKvdJyEgGVf92FJ6P48sTPAqGY4UvsoqyQLT3sTYTigE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707331404; c=relaxed/simple; bh=eaa/MnI0DUDOZ12mwRQxd64w0nmqvV1lJGMXGlfIdDw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=CHsXt2avDaqYjwiuhdke4BT6AYW0peLOKPNxt5h1SYjW0B/B4A9tGY7CKo2N6+oFypycLQLzJ1htCiqnSFPYF+11M9oNuDnfqw7oP2FKMVSR0lzZqhW9+9XTMRqTlyIlKZcOXc4dlBnJAlRlgY90m02baji/x9NhIcnLs+C21KU= 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 1rXmtA-0007mn-Bb; Wed, 07 Feb 2024 19:43:16 +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 1rXmt9-0054Y8-VT; Wed, 07 Feb 2024 19:43:15 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rXmt9-00HRtD-2t; Wed, 07 Feb 2024 19:43:15 +0100 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: Mark Brown Cc: kernel@pengutronix.de, linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Jonathan Cameron Subject: [PATCH v3 21/32] spi: loopback-test: Follow renaming of SPI "master" to "controller" Date: Wed, 7 Feb 2024 19:40:35 +0100 Message-ID: <2f57c89d601d0875cd245a2e95c915b9bfcfc47d.1707324794.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=1142; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=eaa/MnI0DUDOZ12mwRQxd64w0nmqvV1lJGMXGlfIdDw=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlw8641Pe+KdDSJAh2X8RAmDm8QNhzSllf38cQK ARB/tjhJFiJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZcPOuAAKCRCPgPtYfRL+ Tu9VCACKxH+TxatW/iKQ1TPthFJ1VJEQS5Oi0IQmKYZrj3L2fn2uRf0/Zo4QxpBgxuDmbi2B8DH r7kKvxo3GlfghaS+qjedeyDDxU/Mh5W54c5m4rCV+baTyG1HUkhIwWzb7BIeDlSQEdBgVGfYhM3 dZscvUuqNJW08c0XJzDBzBnKxI4umgz8FnccpU+zv/5x/yBZJH/g8yjQgb8Pbt2/Laf+nmaNZ9L yCCvXv1uyAjCIBJsHyZq/sTfLATujsISB84PWrnjE1hB69qVYl4MiQCxCbMt+01Knb+PHQDDEZ4 zo+ypQ5yCwxW2NESg/3KjnFhZ6JdkMYXLKFE12859+VFx+bn 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. Acked-by: Jonathan Cameron Signed-off-by: Uwe Kleine-K=C3=B6nig --- drivers/spi/spi-loopback-test.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/spi/spi-loopback-test.c b/drivers/spi/spi-loopback-tes= t.c index bbf2015d8e5c..fee8893d2751 100644 --- a/drivers/spi/spi-loopback-test.c +++ b/drivers/spi/spi-loopback-test.c @@ -1031,8 +1031,8 @@ int spi_test_run_test(struct spi_device *spi, const s= truct spi_test *test, #define FOR_EACH_ALIGNMENT(var) \ for (var =3D 0; \ var < (test->iterate_##var ? \ - (spi->master->dma_alignment ? \ - spi->master->dma_alignment : \ + (spi->controller->dma_alignment ? \ + spi->controller->dma_alignment : \ test->iterate_##var) : \ 1); \ var++) --=20 2.43.0 From nobody Thu Nov 14 04:56:27 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 CD749127B50 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=1707331406; cv=none; b=cPwl5fKIXbSxyNigWGnZKgKvwS79qIrd7IeDgla9FXq0KCSbJpIpJfLbP1Fz7F/SWTXxwkINbBDEMQwy0Y9Quafj8M641KY/yuydrUe9iHHJBuUkug5wu4uPg6yFY417C84Ke8/PBhU18NItVeS8gS+Mh9GmA86ohlHcyAziCCo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707331406; c=relaxed/simple; bh=b8hJWsXG7Bt5TUY+X52F0IkO1iwX1T0dZ3MvwIZs37k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=RsTIHTvcBFvCKxdMq3D4kEevv3Y2UYmYJfAzvRiSDuY7GkVvfOWNx2gxb0ZRjfcIF74RyrVLBPgAXDQhCyP70qD40/Nx+VqlgpP/WcQdc9nZ6rrvnXR0Vtyz8Q+MGf1QUn8QzMLZrwwBrU3KrXRFfB4yopyFaX1E//px2RbZbMo= 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 1rXmtA-0007n4-UD; Wed, 07 Feb 2024 19:43:16 +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 1rXmtA-0054YD-HY; Wed, 07 Feb 2024 19:43:16 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rXmtA-00HRtH-1T; Wed, 07 Feb 2024 19:43:16 +0100 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: Mark Brown Cc: kernel@pengutronix.de, Matthias Brugger , AngeloGioacchino Del Regno , linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, Jonathan Cameron Subject: [PATCH v3 22/32] spi: slave-mt27xx: Follow renaming of SPI "master" to "controller" Date: Wed, 7 Feb 2024 19:40:36 +0100 Message-ID: <184a5263af2ec01fd5ad9b8db667ae4d6cbec948.1707324794.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=1067; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=b8hJWsXG7Bt5TUY+X52F0IkO1iwX1T0dZ3MvwIZs37k=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlw86+8M4z7ERGC2YgRKokbc/1ZH/C1sXCVRmPZ XTYGPhpNgGJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZcPOvgAKCRCPgPtYfRL+ TmcaCACj305jhazD0RSq3hnVuvKMFTMwKAxXuATdDX9fNjoi1fZmS/EjF5gydXvOaAb8/h6xk+W eB+R0dxz8VSGW9YMH7spESk2HLI1iB9Mx3vxHX4QNKHLQCPPkCDFVMumo4p8/WLPjVHTRIwU992 OPufbaki9gmJYvRrv8ldt21O/Zln8Iw3NDi+YZj84KbAWt2IenMbzv7fDYKXDanziq+ZwSbl5eZ ba9ybtmbZ516KNm41OUp9AXuZpET3PIlaZgq4Uvv63GG4RT5mKTMG1w9M/t6qxXfSBlrtH6WgDt WNb/XJQTPwlXyRbGO+Jxm1qimx1DIJonJ+se/v+lQFg2lqJX 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. Acked-by: Jonathan Cameron Signed-off-by: Uwe Kleine-K=C3=B6nig --- drivers/spi/spi-slave-mt27xx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/spi/spi-slave-mt27xx.c b/drivers/spi/spi-slave-mt27xx.c index 6d6772974783..f1ddf4c099a3 100644 --- a/drivers/spi/spi-slave-mt27xx.c +++ b/drivers/spi/spi-slave-mt27xx.c @@ -297,7 +297,7 @@ static int mtk_spi_slave_transfer_one(struct spi_contro= ller *ctlr, =20 static int mtk_spi_slave_setup(struct spi_device *spi) { - struct mtk_spi_slave *mdata =3D spi_controller_get_devdata(spi->master); + struct mtk_spi_slave *mdata =3D spi_controller_get_devdata(spi->controlle= r); u32 reg_val; =20 reg_val =3D DMA_DONE_EN | DATA_DONE_EN | --=20 2.43.0 From nobody Thu Nov 14 04:56:27 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 555D4127B46 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=QyK0Xs52bdfqld0S1qVBCgkSOdk77odkQ+CaO4C9Hi38rd2wyCHtrqUAguHMbyZvy8uuXn+BiSgLtOBuPPATRW9DLzHKoyRlgN8p2Yl8qn/bzb4xrFNPDp/dcGkQKxT+jXHbAzmj8E1rq5UDj30cj4yQ/f9ukRkjTZNsQbB+zdg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707331405; c=relaxed/simple; bh=f+Gz43aBncDHaeqjyCuKx4M3pTIgDVH1C6QnbLnn8E4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=PLDCMVa1NNx897yrBng+FxYbkCV9EnEdn/mmse2BjsLgGORiTh/xLlfF7fwL7H9UbN7LGWbXUxaR2PBpy5TFhikSbAuukOKZtJ2DY+sZud5gzq38hzzy6Tz2E09lzUo6AONgRt2n6Nv4x4cBCmsfoQ7apfgcAXUV/a47TsFrA2w= 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 1rXmtB-0007p0-Bq; Wed, 07 Feb 2024 19:43:17 +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 1rXmtA-0054YG-UF; Wed, 07 Feb 2024 19:43:16 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rXmtA-00HRtN-2l; Wed, 07 Feb 2024 19:43:16 +0100 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: Mark Brown Cc: kernel@pengutronix.de, linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Jonathan Cameron Subject: [PATCH v3 23/32] spi: spidev: Follow renaming of SPI "master" to "controller" Date: Wed, 7 Feb 2024 19:40:37 +0100 Message-ID: <15ebfdf58a6590962bdd51b49b2e85a69b3bf443.1707324794.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=1094; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=f+Gz43aBncDHaeqjyCuKx4M3pTIgDVH1C6QnbLnn8E4=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlw86/oPdwhihCkIyCjc5ukJhojEhPOFeci3qVw swHLmcRSz+JATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZcPOvwAKCRCPgPtYfRL+ TjHYCACBp+IFKdXejHOMNxfTqboFn2a/edghYu3mR7tSY8ZSz6rJIcD4YKALjzDJrwTKOOdJR6q U5WcHS/pLQALvLaCEExTGm52vnMrwEPpKkTEQlCdSL8kEUmIqNC9yqHImiNWBx549O16KxRK3ut yH7n6tcyFHLLrOrgxUG4bosqjyUbq6jPOd74cIh6hOE0L790Vrw0otUncgOm+dmRmPq/3CEbQMP MsdST6AVuHMcHGlFqM2qLG8gEhvE82lioxIJN6gSYXiP5i9JrhImToU8g+jC++KCBQ7CycOTIgw t8v4SKj8c4LkCT1Yufk8Av1HcY4R+AXZnN74EQzN9+WhY0O5 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. Acked-by: Jonathan Cameron Signed-off-by: Uwe Kleine-K=C3=B6nig --- drivers/spi/spidev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c index 655f2c959cd4..95fb5f1c91c1 100644 --- a/drivers/spi/spidev.c +++ b/drivers/spi/spidev.c @@ -802,7 +802,7 @@ static int spidev_probe(struct spi_device *spi) spidev->devt =3D MKDEV(SPIDEV_MAJOR, minor); dev =3D device_create(&spidev_class, &spi->dev, spidev->devt, spidev, "spidev%d.%d", - spi->master->bus_num, spi_get_chipselect(spi, 0)); + spi->controller->bus_num, spi_get_chipselect(spi, 0)); status =3D PTR_ERR_OR_ZERO(dev); } else { dev_dbg(&spi->dev, "no minor number available!\n"); --=20 2.43.0 From nobody Thu Nov 14 04:56:27 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 3BDB212F5A1 for ; Wed, 7 Feb 2024 18:43:31 +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=1707331414; cv=none; b=WicPBoRZMFQifTyeQz4XyG6zDPtVE3BNC/KJRIcc2CNcdtlmn/PeRWyiwD+MHNOMaza7MO2fBbA7puDhHdyrB2JMMD9MGivI5gMFSTxmMmluKIlWfePk4HEELKnigGfl9pqnYhvobGoveGTJW2WKxyj+hI7iFL2G8ZIcRedcr40= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707331414; c=relaxed/simple; bh=jLSDSfpv7WSEI2jePythvXMi4bwtOGfFN61uJJKBvR4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=YxPpDCh8ripNT69FHvLkSiHbQYUMEhe2eMc/S5Au2AWBVVMAHbURg6aRGPOFLF9mb1FlnxwzX7YKg3qCXYYH8uiehV14P3xHFogRHLrbUjNqlXnXrb/gz2wT+YF7lVg6dbz0lEVWkXrSjR8JJrUGhSrLKReaWXp1NAA+iPPxqtk= 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 1rXmtC-0007se-3M; Wed, 07 Feb 2024 19:43:18 +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 1rXmtB-0054YL-A0; Wed, 07 Feb 2024 19:43:17 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rXmtB-00HRtR-0h; Wed, 07 Feb 2024 19:43:17 +0100 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: Mark Brown Cc: kernel@pengutronix.de, Greg Kroah-Hartman , Thomas Zimmermann , Javier Martinez Canillas , Sam Ravnborg , Amit Kumar Mahapatra , dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Jonathan Cameron Subject: [PATCH v3 24/32] staging: fbtft: Follow renaming of SPI "master" to "controller" Date: Wed, 7 Feb 2024 19:40:38 +0100 Message-ID: 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=1645; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=jLSDSfpv7WSEI2jePythvXMi4bwtOGfFN61uJJKBvR4=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlw87GXqnqC9di7ObQ9f5f86SeO9J8OHbB6IyeF M0/bFpSbpmJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZcPOxgAKCRCPgPtYfRL+ TuGBB/9TlS6oRq9gEfvRb9gRhMiLfLJhtlORbYI0ifh40f/j0hyzeyZynD3Fq61MCA25AK4L1oL bUEmiFI9dkmdpl/wxEeoFDRn3uUORsjdca5iTgkJ61wtS+nHjVGel9Itd+lMwVfVKjEOurt1mc2 QFyyRLeIt5WqYZhtg25+BcZnHayunBMMYQgFCPVv9FsauTTBQwpUJWl3B7rEoPfzPJENssYMRIO MwvUqvxZfVtdIDlV5jpwCkzw7dgKr6qQECrj/iiev9zmuIJrkYjPKc/Kd1fQwnxbdkopXRbpvns dBa9kOZixjMojyHMla3Xgcm7uqCKemj6XZLqGQIuEbIj7IhH 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. Acked-by: Greg Kroah-Hartman Acked-by: Jonathan Cameron Signed-off-by: Uwe Kleine-K=C3=B6nig --- drivers/staging/fbtft/fbtft-core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/fbtft/fbtft-core.c b/drivers/staging/fbtft/fbt= ft-core.c index 3626f429b002..68add4d598ae 100644 --- a/drivers/staging/fbtft/fbtft-core.c +++ b/drivers/staging/fbtft/fbtft-core.c @@ -794,7 +794,7 @@ int fbtft_register_framebuffer(struct fb_info *fb_info) if (par->txbuf.buf && par->txbuf.len >=3D 1024) sprintf(text1, ", %zu KiB buffer memory", par->txbuf.len >> 10); if (spi) - sprintf(text2, ", spi%d.%d at %d MHz", spi->master->bus_num, + sprintf(text2, ", spi%d.%d at %d MHz", spi->controller->bus_num, spi_get_chipselect(spi, 0), spi->max_speed_hz / 1000000); dev_info(fb_info->dev, "%s frame buffer, %dx%d, %d KiB video memory%s, fps=3D%lu%s\n", @@ -1215,7 +1215,7 @@ int fbtft_probe_common(struct fbtft_display *display, =20 /* 9-bit SPI setup */ if (par->spi && display->buswidth =3D=3D 9) { - if (par->spi->master->bits_per_word_mask & SPI_BPW_MASK(9)) { + if (par->spi->controller->bits_per_word_mask & SPI_BPW_MASK(9)) { par->spi->bits_per_word =3D 9; } else { dev_warn(&par->spi->dev, --=20 2.43.0 From nobody Thu Nov 14 04:56:27 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 0710312C54B for ; Wed, 7 Feb 2024 18:43: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=1707331413; cv=none; b=J55oA0u8ZvB3n1J8WDGA3J4NiKkI4CRZmyZELO/YgreOUSsZHgkXykPX/zegKIOaqo9q5XjgPtTJlyM/PD0fLMZ0xO9tn42evVehBPQL1DQF0zn1zEx6bD6ELb8//1/ymeYcsItIXBxyRMBR11jpnLUe9WVGt4chRuOCob8xxaA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707331413; c=relaxed/simple; bh=vpDuTe5EAw0ElIUOb6YoyY9WKiKn5pwm75mKyxxDj84=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=ARB/yHe3Djn49UvMyD4zAk9K+eRp4asYNdWKfRxQ03eju9MEir1+b1O6XfDluGslrMXxR0He57cIXAEcUVLp/u2PrMjH0kBClqKJlpihYCnewlegw0bM76So3PO+zhRSZ4pVf6omX7JVPdxqMaWIlA5eWAawb+qQSdprHGPY3yU= 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 1rXmtC-0007vF-7U; Wed, 07 Feb 2024 19:43:18 +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 1rXmtB-0054YP-Jl; Wed, 07 Feb 2024 19:43:17 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rXmtB-00HRtV-1g; Wed, 07 Feb 2024 19:43:17 +0100 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: Mark Brown Cc: kernel@pengutronix.de, Viresh Kumar , Rui Miguel Silva , Johan Hovold , Alex Elder , Greg Kroah-Hartman , greybus-dev@lists.linaro.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Viresh Kumar , Jonathan Cameron Subject: [PATCH v3 25/32] staging: greybus: spi: Follow renaming of SPI "master" to "controller" Date: Wed, 7 Feb 2024 19:40:39 +0100 Message-ID: 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=6419; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=vpDuTe5EAw0ElIUOb6YoyY9WKiKn5pwm75mKyxxDj84=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlw87LbyOl/56v1AiUmZxs/6QoCHYQx7QvZoZP5 cG28YYGs2iJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZcPOywAKCRCPgPtYfRL+ TjFxB/958zzfe6nppdfLKw+CAd+OkRm1DjnN94AI4WhAwTtvQkWb7ExN6WpJn+NVwnOzDZshMMY Aat7x6KudEEUagTdYZcQUurlPZ0lmGyclsbXXwE1Kb/j5t/YdmsTwtY727bqQmiPfvm04yCQMJi BzgEfHDSflaMd/r7TM+0yG4mo/56a0boSVtBtu5HVbPZp+lXzazEZU0bRnF/vVOeZVaEAHPE8Rb xlWnZNAXCnM0GnFkaLaD+eNaDONuSOZhO9XiBD6XCfnQlaLis7ymVuSLclUY0FX82vhkcO4tb9G hA+XYGwO0hpJoxTCJUAPDsfmqsfY/bo3oxgW1/J3fX7KXQHU 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. Acked-by: Viresh Kumar Acked-by: Greg Kroah-Hartman Acked-by: Jonathan Cameron Signed-off-by: Uwe Kleine-K=C3=B6nig --- drivers/staging/greybus/spilib.c | 66 ++++++++++++++++---------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/drivers/staging/greybus/spilib.c b/drivers/staging/greybus/spi= lib.c index efb3bec58e15..34f10685139f 100644 --- a/drivers/staging/greybus/spilib.c +++ b/drivers/staging/greybus/spilib.c @@ -42,7 +42,7 @@ struct gb_spilib { =20 #define XFER_TIMEOUT_TOLERANCE 200 =20 -static struct spi_master *get_master_from_spi(struct gb_spilib *spi) +static struct spi_controller *get_controller_from_spi(struct gb_spilib *sp= i) { return gb_connection_get_data(spi->connection); } @@ -324,10 +324,10 @@ static void gb_spi_decode_response(struct gb_spilib *= spi, } } =20 -static int gb_spi_transfer_one_message(struct spi_master *master, +static int gb_spi_transfer_one_message(struct spi_controller *ctlr, struct spi_message *msg) { - struct gb_spilib *spi =3D spi_master_get_devdata(master); + struct gb_spilib *spi =3D spi_controller_get_devdata(ctlr); struct gb_connection *connection =3D spi->connection; struct gb_spi_transfer_response *response; struct gb_operation *operation; @@ -371,21 +371,21 @@ static int gb_spi_transfer_one_message(struct spi_mas= ter *master, out: msg->status =3D ret; clean_xfer_state(spi); - spi_finalize_current_message(master); + spi_finalize_current_message(ctlr); =20 return ret; } =20 -static int gb_spi_prepare_transfer_hardware(struct spi_master *master) +static int gb_spi_prepare_transfer_hardware(struct spi_controller *ctlr) { - struct gb_spilib *spi =3D spi_master_get_devdata(master); + struct gb_spilib *spi =3D spi_controller_get_devdata(ctlr); =20 return spi->ops->prepare_transfer_hardware(spi->parent); } =20 -static int gb_spi_unprepare_transfer_hardware(struct spi_master *master) +static int gb_spi_unprepare_transfer_hardware(struct spi_controller *ctlr) { - struct gb_spilib *spi =3D spi_master_get_devdata(master); + struct gb_spilib *spi =3D spi_controller_get_devdata(ctlr); =20 spi->ops->unprepare_transfer_hardware(spi->parent); =20 @@ -440,7 +440,7 @@ static int gb_spi_get_master_config(struct gb_spilib *s= pi) =20 static int gb_spi_setup_device(struct gb_spilib *spi, u8 cs) { - struct spi_master *master =3D get_master_from_spi(spi); + struct spi_controller *ctlr =3D get_controller_from_spi(spi); struct gb_spi_device_config_request request; struct gb_spi_device_config_response response; struct spi_board_info spi_board =3D { {0} }; @@ -471,11 +471,11 @@ static int gb_spi_setup_device(struct gb_spilib *spi,= u8 cs) return -EINVAL; =20 spi_board.mode =3D le16_to_cpu(response.mode); - spi_board.bus_num =3D master->bus_num; + spi_board.bus_num =3D ctlr->bus_num; spi_board.chip_select =3D cs; spi_board.max_speed_hz =3D le32_to_cpu(response.max_speed_hz); =20 - spidev =3D spi_new_device(master, &spi_board); + spidev =3D spi_new_device(ctlr, &spi_board); if (!spidev) return -EINVAL; =20 @@ -486,52 +486,52 @@ int gb_spilib_master_init(struct gb_connection *conne= ction, struct device *dev, struct spilib_ops *ops) { struct gb_spilib *spi; - struct spi_master *master; + struct spi_controller *ctlr; int ret; u8 i; =20 /* Allocate master with space for data */ - master =3D spi_alloc_master(dev, sizeof(*spi)); - if (!master) { + ctlr =3D spi_alloc_master(dev, sizeof(*spi)); + if (!ctlr) { dev_err(dev, "cannot alloc SPI master\n"); return -ENOMEM; } =20 - spi =3D spi_master_get_devdata(master); + spi =3D spi_controller_get_devdata(ctlr); spi->connection =3D connection; - gb_connection_set_data(connection, master); + gb_connection_set_data(connection, ctlr); spi->parent =3D dev; spi->ops =3D ops; =20 - /* get master configuration */ + /* get controller configuration */ ret =3D gb_spi_get_master_config(spi); if (ret) goto exit_spi_put; =20 - master->bus_num =3D -1; /* Allow spi-core to allocate it dynamically */ - master->num_chipselect =3D spi->num_chipselect; - master->mode_bits =3D spi->mode; - master->flags =3D spi->flags; - master->bits_per_word_mask =3D spi->bits_per_word_mask; + ctlr->bus_num =3D -1; /* Allow spi-core to allocate it dynamically */ + ctlr->num_chipselect =3D spi->num_chipselect; + ctlr->mode_bits =3D spi->mode; + ctlr->flags =3D spi->flags; + ctlr->bits_per_word_mask =3D spi->bits_per_word_mask; =20 /* Attach methods */ - master->cleanup =3D gb_spi_cleanup; - master->setup =3D gb_spi_setup; - master->transfer_one_message =3D gb_spi_transfer_one_message; + ctlr->cleanup =3D gb_spi_cleanup; + ctlr->setup =3D gb_spi_setup; + ctlr->transfer_one_message =3D gb_spi_transfer_one_message; =20 if (ops && ops->prepare_transfer_hardware) { - master->prepare_transfer_hardware =3D + ctlr->prepare_transfer_hardware =3D gb_spi_prepare_transfer_hardware; } =20 if (ops && ops->unprepare_transfer_hardware) { - master->unprepare_transfer_hardware =3D + ctlr->unprepare_transfer_hardware =3D gb_spi_unprepare_transfer_hardware; } =20 - master->auto_runtime_pm =3D true; + ctlr->auto_runtime_pm =3D true; =20 - ret =3D spi_register_master(master); + ret =3D spi_register_controller(ctlr); if (ret < 0) goto exit_spi_put; =20 @@ -548,12 +548,12 @@ int gb_spilib_master_init(struct gb_connection *conne= ction, struct device *dev, return 0; =20 exit_spi_put: - spi_master_put(master); + spi_controller_put(ctlr); =20 return ret; =20 exit_spi_unregister: - spi_unregister_master(master); + spi_unregister_controller(ctlr); =20 return ret; } @@ -561,9 +561,9 @@ EXPORT_SYMBOL_GPL(gb_spilib_master_init); =20 void gb_spilib_master_exit(struct gb_connection *connection) { - struct spi_master *master =3D gb_connection_get_data(connection); + struct spi_controller *ctlr =3D gb_connection_get_data(connection); =20 - spi_unregister_master(master); + spi_unregister_controller(ctlr); } EXPORT_SYMBOL_GPL(gb_spilib_master_exit); =20 --=20 2.43.0 From nobody Thu Nov 14 04:56:27 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 655F1129A73 for ; Wed, 7 Feb 2024 18:43:26 +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=1707331408; cv=none; b=s6CyPukmZsmjjyXy3reRphWHug37YTOpLd53s5lOBCalIRKv76j4R4XO75hFb+kOGj3akwwUiWhiOyMZl9DglUsNTNpHZRu1sQ1jAuBBsnzVL09B9/WehUQ8sYHY3X8n0ZOSo3gP6nqtKnDbgbUVWNrnbVIgw1exYPjKaxjAVEc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707331408; c=relaxed/simple; bh=uVMXV1VAwmhP57PkwJ+8EfziPZH/wl6a5rMlX05Ius0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=M5dpZqGjUY6jVHVE2MmVsWPD6W6lPI52a5poi8TRtjw0YfHcctXmx6LtWHAxhOve6Xr/ZEHjXmCCMwM4y6NMK1iuSFgdzetnIPMMNTGg2biDztX2Z14qhSs36dhJjrT4o/jSLjVQm1gaylt+G8eoD6dQw13FmvGsYPyv8CAkz80= 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 1rXmtC-0007yo-Kk; Wed, 07 Feb 2024 19:43:18 +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 1rXmtC-0054YS-0X; Wed, 07 Feb 2024 19:43:18 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rXmtB-00HRtZ-31; Wed, 07 Feb 2024 19:43:17 +0100 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: Mark Brown Cc: kernel@pengutronix.de, Peter Huewe , Jarkko Sakkinen , Jason Gunthorpe , linux-integrity@vger.kernel.org, linux-kernel@vger.kernel.org, Jonathan Cameron Subject: [PATCH v3 26/32] tpm_tis_spi: Follow renaming of SPI "master" to "controller" Date: Wed, 7 Feb 2024 19:40:40 +0100 Message-ID: <29000c8fc0612974242e3c23d14dd4771b92c71e.1707324794.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=1354; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=uVMXV1VAwmhP57PkwJ+8EfziPZH/wl6a5rMlX05Ius0=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlw87QEEwTnOWMpiwjTY7gvENhprUqKM6u2t+pl EAyZ0X8+/qJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZcPO0AAKCRCPgPtYfRL+ TmnQCACF4kgbIRosnrHH0p+K1BjTaEvGGIQkvRZrdbR50l6niFbRyWV27GK+tVbI4aO3oQf7oBx t+AE2CbnmWxDfPAY64PH2qopJ3KDWOjYzMyaJrfPLhEWpP/5HuBBI3mLYKZ8FVqHEg9l2OoUFJB yg/C03oNmWZa+z47BEFZzJSynYGpdHaxWxwUt4yscetouY3hcCOGtW0YnPjwk1/lOyEnGL1wEBn 8VsR+71mu0vTR93PW+EUYFrYAfjCQy0yIVQ5bz43MhtUWl/bEn9uJoL9+oHs0gz53CTwFMMbUIv xi3yB6jv/x45yoAPN7UKtu7HJTgGg2grISAQNllBGWKJTLK2 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. Reviewed-by: Jarkko Sakkinen Acked-by: Jonathan Cameron Signed-off-by: Uwe Kleine-K=C3=B6nig --- drivers/char/tpm/tpm_tis_spi_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/char/tpm/tpm_tis_spi_main.c b/drivers/char/tpm/tpm_tis= _spi_main.c index c5c3197ee29f..c647de7b3709 100644 --- a/drivers/char/tpm/tpm_tis_spi_main.c +++ b/drivers/char/tpm/tpm_tis_spi_main.c @@ -146,7 +146,7 @@ static int tpm_tis_spi_transfer_full(struct tpm_tis_dat= a *data, u32 addr, struct spi_transfer spi_xfer; u8 transfer_len; =20 - spi_bus_lock(phy->spi_device->master); + spi_bus_lock(phy->spi_device->controller); =20 while (len) { transfer_len =3D min_t(u16, len, MAX_SPI_FRAMESIZE); @@ -210,7 +210,7 @@ static int tpm_tis_spi_transfer_full(struct tpm_tis_dat= a *data, u32 addr, spi_sync_locked(phy->spi_device, &m); } =20 - spi_bus_unlock(phy->spi_device->master); + spi_bus_unlock(phy->spi_device->controller); return ret; } =20 --=20 2.43.0 From nobody Thu Nov 14 04:56:27 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 4F31712A16D for ; Wed, 7 Feb 2024 18:43:26 +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=1707331410; cv=none; b=iebfUkj3ZXLYth4kbquueHkxeXrMOh0PRcq/DeSDAIMb8o/t6tZW4biNo1A9xZNAcG2l/se/ZaXDRDCsSIZcPeWHZWYX7uTHOiclESNLbpRDnzJY6MLGEwpElct0X5tLHLJIaTDyJW44FgHxspGs4Hqbp+ZbvHPRn8No6CBOL0Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707331410; c=relaxed/simple; bh=99DDKinv2mNpVy8WsuExRMgppG6Feg6EIY4nGansGMc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Dd5MnW4qHD8PLostJM2OZCygiM8VVBpI+Smt4Jx+/rOrS5fquJ8tNw3OJebzC8QIWIoMu4VFF/mBZpZt1aNA0m9NxkzIPZBOpwxqFh5UUQ3p25RAPoMr9VUj8436JUoyFuQRIsrw1EO9dFOc37l/vMk9G8GsPMPJMpUIx8e7AZU= 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 1rXmtD-00080z-6a; Wed, 07 Feb 2024 19:43:19 +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 1rXmtC-0054YX-Er; Wed, 07 Feb 2024 19:43:18 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rXmtC-00HRtd-1C; Wed, 07 Feb 2024 19:43:18 +0100 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: Mark Brown Cc: kernel@pengutronix.de, Greg Kroah-Hartman , Herve Codina , Krzysztof Kozlowski , Andy Shevchenko , Dmitry Torokhov , Rob Herring , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Jonathan Cameron Subject: [PATCH v3 27/32] usb: gadget: max3420_udc: Follow renaming of SPI "master" to "controller" Date: Wed, 7 Feb 2024 19:40:41 +0100 Message-ID: <5caf03b6f321a9870aabb9282f1f22211d052740.1707324794.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=1155; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=99DDKinv2mNpVy8WsuExRMgppG6Feg6EIY4nGansGMc=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlw87X8CKBfJjQGw7enWV1NiZW9ae6aJm5SZX0A 6IU4fm3qOeJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZcPO1wAKCRCPgPtYfRL+ ThjrCAC5mKskhxvokh2bDTPbrEWwQHQL2udrv2F2tbNGDRfK3H5Sg0fbxkkUQiCl7qgmwjWnRfk 8hdp9ewzr1WSo4I8H+BE6rr95JoAyNZG23RZ75FbHqYVyKibyWsI6yNbUrL9dEydkHiHtEylUYP H+DbVe5GsDtp+ZTuphAXnnTb8CK0oRIFOoYaDZFb2IBHIR0anc7twBDsVSXkFa0CR2w1znTUIdi 33fOIuG5sGHoKLoMpKnEoBEnX7Df36NpPKFtkN1ZrihwzCWxvMLCkPTuZEoPmdVbzjWkRSVePHM MHb5LZGnhaO6+g/N+wOTqPtrvEFuwKMXk+huED+ENkKNbvIT 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. Reviewed-by: Herve Codina Acked-by: Greg Kroah-Hartman Acked-by: Jonathan Cameron Signed-off-by: Uwe Kleine-K=C3=B6nig --- drivers/usb/gadget/udc/max3420_udc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/gadget/udc/max3420_udc.c b/drivers/usb/gadget/udc/= max3420_udc.c index 89e8cf2a2a7d..7349ea774adf 100644 --- a/drivers/usb/gadget/udc/max3420_udc.c +++ b/drivers/usb/gadget/udc/max3420_udc.c @@ -1201,7 +1201,7 @@ static int max3420_probe(struct spi_device *spi) int err, irq; u8 reg[8]; =20 - if (spi->master->flags & SPI_CONTROLLER_HALF_DUPLEX) { + if (spi->controller->flags & SPI_CONTROLLER_HALF_DUPLEX) { dev_err(&spi->dev, "UDC needs full duplex to work\n"); return -EINVAL; } --=20 2.43.0 From nobody Thu Nov 14 04:56:27 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 A0DC212B175 for ; Wed, 7 Feb 2024 18:43:28 +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=1707331412; cv=none; b=nEIbPZsbrV5u0gOg5PHShPyQG2epAU9fHzaNZHBBRKkpQNck2SAGgI7Lv9hC27/NjybvhdiH+cp6jQSnDu8xr1146gzEhekcyEo/gHNL0k21H9j7cJ+F+HGwi4liu76e7P6ShYow1qerp62K7Y+351UUXU8jxpOgLiN/3eY3uEQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707331412; c=relaxed/simple; bh=XCjKjslPjqHKRPhjAFqin0asrGjQXScMLqttnb/ERUQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=uYEzxWWkKX11tnLIDtNL81lH886I+NpwuwbNFu7AR0AMVvDswTcHoScEuDTuatx/oeXa1DT1TLlvdLxSU6fnWO6JTrr0/WcpyFEX0w2uifZdebFHZv0YLev1lNtn1MWjTIPbdDz0wmhXzZwfXNa7QpP7yXiTAdnuQm+nq6/PoJA= 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 1rXmtD-00082i-BC; Wed, 07 Feb 2024 19:43:19 +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 1rXmtC-0054Yb-Qo; Wed, 07 Feb 2024 19:43:18 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rXmtC-00HRth-2Q; Wed, 07 Feb 2024 19:43:18 +0100 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: Mark Brown Cc: kernel@pengutronix.de, Helge Deller , Jonathan Cameron , Dario Binacchi , linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 28/32] video: fbdev: mmp: Follow renaming of SPI "master" to "controller" Date: Wed, 7 Feb 2024 19:40:42 +0100 Message-ID: <136f59b6e272e5ff7ec210627c9c3ea27d066d51.1707324794.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=2770; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=XCjKjslPjqHKRPhjAFqin0asrGjQXScMLqttnb/ERUQ=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlw87cfCDKPouSdyY/ruXPqXmi502nagTlT3Zz4 C1qUXW8K0GJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZcPO3AAKCRCPgPtYfRL+ TvX3CACqveA/rD7JWSIm5VWKcQuWk6O6yOGgjkNs3so17MGNpc9D3WJa+1Q3Fj9YswI/+mc2cvv lM7DaKL+zFnNP+sKDzyE86BmdsQTMXD9C446LLZJvrtEywze4r0dfh1bSHPB6t3g9TTIXE0E6e+ 5HD/C2dCcF/uquUYSd5burrHstyxfQJ2xooOfYph3zLZ4D/K+8PbcJV5XgEYdwQU2GRE+OOUEfl T/cPQMNlK0VlFMfaAl6UKj8ihO6jBXAyPc4LWnDgVfkKr+4gqogS30viLdt6DlnE9MNmKZB6fEj y2Xqa0X3zEvdPeLNY+ennxVjeiVzVibBGlODr4KPrxuLJAMR 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. Acked-by: Jonathan Cameron Signed-off-by: Uwe Kleine-K=C3=B6nig --- drivers/video/fbdev/mmp/hw/mmp_spi.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/video/fbdev/mmp/hw/mmp_spi.c b/drivers/video/fbdev/mmp= /hw/mmp_spi.c index 0f8f0312a7c4..cf23650d7f0b 100644 --- a/drivers/video/fbdev/mmp/hw/mmp_spi.c +++ b/drivers/video/fbdev/mmp/hw/mmp_spi.c @@ -32,7 +32,7 @@ static inline int lcd_spi_write(struct spi_device *spi, u= 32 data) int timeout =3D 100000, isr, ret =3D 0; u32 tmp; void __iomem *reg_base =3D (void __iomem *) - *(void **)spi_master_get_devdata(spi->master); + *(void **) spi_controller_get_devdata(spi->controller); =20 /* clear ISR */ writel_relaxed(~SPI_IRQ_MASK, reg_base + SPU_IRQ_ISR); @@ -81,7 +81,7 @@ static inline int lcd_spi_write(struct spi_device *spi, u= 32 data) static int lcd_spi_setup(struct spi_device *spi) { void __iomem *reg_base =3D (void __iomem *) - *(void **)spi_master_get_devdata(spi->master); + *(void **) spi_controller_get_devdata(spi->controller); u32 tmp; =20 tmp =3D CFG_SCLKCNT(16) | @@ -136,32 +136,32 @@ static int lcd_spi_one_transfer(struct spi_device *sp= i, struct spi_message *m) =20 int lcd_spi_register(struct mmphw_ctrl *ctrl) { - struct spi_master *master; + struct spi_controller *ctlr; void **p_regbase; int err; =20 - master =3D spi_alloc_master(ctrl->dev, sizeof(void *)); - if (!master) { + ctlr =3D spi_alloc_master(ctrl->dev, sizeof(void *)); + if (!ctlr) { dev_err(ctrl->dev, "unable to allocate SPI master\n"); return -ENOMEM; } - p_regbase =3D spi_master_get_devdata(master); + p_regbase =3D spi_controller_get_devdata(ctlr); *p_regbase =3D (void __force *)ctrl->reg_base; =20 /* set bus num to 5 to avoid conflict with other spi hosts */ - master->bus_num =3D 5; - master->num_chipselect =3D 1; - master->setup =3D lcd_spi_setup; - master->transfer =3D lcd_spi_one_transfer; + ctlr->bus_num =3D 5; + ctlr->num_chipselect =3D 1; + ctlr->setup =3D lcd_spi_setup; + ctlr->transfer =3D lcd_spi_one_transfer; =20 - err =3D spi_register_master(master); + err =3D spi_register_controller(ctlr); if (err < 0) { dev_err(ctrl->dev, "unable to register SPI master\n"); - spi_master_put(master); + spi_controller_put(ctlr); return err; } =20 - dev_info(&master->dev, "registered\n"); + dev_info(&ctlr->dev, "registered\n"); =20 return 0; } --=20 2.43.0 From nobody Thu Nov 14 04:56:27 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 B74F712FB09 for ; Wed, 7 Feb 2024 18:43:32 +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=1707331414; cv=none; b=CHLXdz347RLmCntva72l7m+u4aluP6Uj9LbvY5YpSgpwg+mveaCSXn7AotP1g6Nl0i5iij/RGJTy4nyuVes/8NlWz+zI9Bn/QZ6vsOzVYoRy1axhToeqYV8van8paMsVSQ2fCxOWyVHVuwDnycHKBOqAwaHTpXBDCQHzSSWUt9Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707331414; c=relaxed/simple; bh=VHrosqJBw/jD2fXLXTk6B7k9ErsOSKDugMqkiDkHpEU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=iGMOvo86a2xEAyqxXWoFwbhv/uzO7hejd/Qz3eo7u+dZkOovpf9VULNlQ9jBlWhq4s9wdpEKQ/kWiuTwy6Weet+ytkWx7NCfVjbHZrsNHM7e+TS0CVOqZI3KE9mSV/D+M7pt9kjXcqfQFEkgaRo7GgzK1KUR+U5xsgim7WLa51Q= 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 1rXmtE-00086R-84; Wed, 07 Feb 2024 19:43:20 +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 1rXmtD-0054Yf-Av; Wed, 07 Feb 2024 19:43:19 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rXmtD-00HRtl-0o; Wed, 07 Feb 2024 19:43:19 +0100 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: Mark Brown Cc: kernel@pengutronix.de, Kalle Valo , Dmitry Antipov , Jonathan Cameron , Amit Kumar Mahapatra , libertas-dev@lists.infradead.org, linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 29/32] wifi: libertas: Follow renaming of SPI "master" to "controller" Date: Wed, 7 Feb 2024 19:40:43 +0100 Message-ID: <971429eacddbad4c2f49b783ddd68746c1929ab3.1707324794.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=1219; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=VHrosqJBw/jD2fXLXTk6B7k9ErsOSKDugMqkiDkHpEU=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlw87kvHJm3k99v3JLvxkbz6eOQnEymFaod/Qtw nSZ+2lPOu+JATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZcPO5AAKCRCPgPtYfRL+ TkJkB/9MqJcVzo/oH3CtG2kkoGwi4IpSxpVsGFpp+yF3RdDaCtDk2KBdfK+lY8wVJLX/BuAh6Wz 7O7Fa3ZDbhzeyfXQQZUnkIwkUUI52U0ARmrXI2Dnl9JulBCfTlHHQkTXIJ2n/t+oPDY2l4Jwas3 KahFY0rdhvXSpVFe04dC7GMisI8nrlysgeAJ/IVZ4QOib6usVwtOFnbej+ebk1KFo56S/n4bpCm Rk1mJO+McINm/vyOOfSp3XZtBC/xBE9NvCd9BzUVdZTzk5huwSHBKvYcpaQOVl0qA6+ksnYNrXf jITbEf7XGJBSOcVzIlKKS16S229rmir2iZDuUZYLIZZBq4RS 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. Acked-by: Kalle Valo Acked-by: Jonathan Cameron Signed-off-by: Uwe Kleine-K=C3=B6nig --- drivers/net/wireless/marvell/libertas/if_spi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/marvell/libertas/if_spi.c b/drivers/net/w= ireless/marvell/libertas/if_spi.c index 8690b0114e23..b722a6587fd3 100644 --- a/drivers/net/wireless/marvell/libertas/if_spi.c +++ b/drivers/net/wireless/marvell/libertas/if_spi.c @@ -1052,7 +1052,7 @@ static int if_spi_init_card(struct if_spi_card *card) "attached to SPI bus_num %d, chip_select %d. " "spi->max_speed_hz=3D%d\n", card->card_id, card->card_rev, - card->spi->master->bus_num, + card->spi->controller->bus_num, spi_get_chipselect(card->spi, 0), card->spi->max_speed_hz); err =3D if_spi_prog_helper_firmware(card, helper); --=20 2.43.0 From nobody Thu Nov 14 04:56:27 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 07345129A61 for ; Wed, 7 Feb 2024 18:43:26 +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=1707331408; cv=none; b=rHKAdUbFL8++xMfaDrfx+TyHSUCY08sovqX+xEDTMfTgiwXenZYAk2hzMhp6a27KyKdcLozp7q34zJV2PxdnHc7A7XGbG04Vzc5Z7Wmf91tsQAbW62atDVwBkZAmv0sFQT8PsyF94hFnfCIcSzfsw1BBhAsKFgXQp0yjUA1lDAk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707331408; c=relaxed/simple; bh=bUQZzxWEsC38j5u4o12sYWtgM3xTR+LDUOMiAhoEnzE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Q13E/+4ok4cS2u/4qjTGq+fo6QKp5TO5WfnRONCFtGuNGtFNWHBKoBzhA/55GsEWBGwWRO7sbn3iDrCGiqgvGalPTYUDeUtpdSbbCNUoryuSuPM95sQMXh3QCW4YJUb8HVMzHLernTuKL4LPlJZwPcF0PUXUi5VEdAg3HcXoB/I= 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 1rXmtE-00088R-Ok; Wed, 07 Feb 2024 19:43:20 +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 1rXmtD-0054Yj-Sn; Wed, 07 Feb 2024 19:43:19 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rXmtD-00HRtp-2c; Wed, 07 Feb 2024 19:43:19 +0100 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: Mark Brown Cc: kernel@pengutronix.de, linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Jonathan Cameron Subject: [PATCH v3 30/32] spi: fsl-lib: Follow renaming of SPI "master" to "controller" Date: Wed, 7 Feb 2024 19:40:44 +0100 Message-ID: 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=1912; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=bUQZzxWEsC38j5u4o12sYWtgM3xTR+LDUOMiAhoEnzE=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlw87ltl4tVo3cFqk/0IdUsQFIoJbQHkNzE5gWK EWgNSMBcf+JATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZcPO5QAKCRCPgPtYfRL+ TicdCAC1XkEoNZMlg4ApVYE8yo8ttSKyIOhZLZ9vhIHhpoPwmTY55khxCExzpRGRHKKS5TEf4PP NYRkeoYEuXLdIfw0KhNIyw29zsD75wITrujNmwjefNrWdGo8r+/gZYKLtiWbi9RJkaUCzfz1jg9 I90pMe0UtlcKlA6+id+4aXTDbH61Ux3cc73flTWYLBPuJO00f8+5LjTDeqlq9l5WLrIMG01iOv4 57Nkg5xSKFe+Gl+7e9Ig9+kP0Z4yhumT/qaHKfJrIaWR9BEzDyjfU7xduZvbb4x7Wmw8SgsiYkE MmksSAVm//EJZbufNzFR2LIr5vpR3g3fRNc8vpXCwHswwUaT 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. Acked-by: Jonathan Cameron Signed-off-by: Uwe Kleine-K=C3=B6nig --- drivers/spi/spi-fsl-lib.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/spi/spi-fsl-lib.c b/drivers/spi/spi-fsl-lib.c index 885757c29fbb..4fc2c56555b5 100644 --- a/drivers/spi/spi-fsl-lib.c +++ b/drivers/spi/spi-fsl-lib.c @@ -82,18 +82,18 @@ void mpc8xxx_spi_probe(struct device *dev, struct resou= rce *mem, unsigned int irq) { struct fsl_spi_platform_data *pdata =3D dev_get_platdata(dev); - struct spi_master *master; + struct spi_controller *ctlr; struct mpc8xxx_spi *mpc8xxx_spi; =20 - master =3D dev_get_drvdata(dev); + ctlr =3D dev_get_drvdata(dev); =20 /* the spi->mode bits understood by this driver: */ - master->mode_bits =3D SPI_CPOL | SPI_CPHA | SPI_CS_HIGH + ctlr->mode_bits =3D SPI_CPOL | SPI_CPHA | SPI_CS_HIGH | SPI_LSB_FIRST | SPI_LOOP; =20 - master->dev.of_node =3D dev->of_node; + ctlr->dev.of_node =3D dev->of_node; =20 - mpc8xxx_spi =3D spi_master_get_devdata(master); + mpc8xxx_spi =3D spi_controller_get_devdata(ctlr); mpc8xxx_spi->dev =3D dev; mpc8xxx_spi->get_rx =3D mpc8xxx_spi_rx_buf_u8; mpc8xxx_spi->get_tx =3D mpc8xxx_spi_tx_buf_u8; @@ -104,8 +104,8 @@ void mpc8xxx_spi_probe(struct device *dev, struct resou= rce *mem, mpc8xxx_spi->rx_shift =3D 0; mpc8xxx_spi->tx_shift =3D 0; =20 - master->bus_num =3D pdata->bus_num; - master->num_chipselect =3D pdata->max_chipselect; + ctlr->bus_num =3D pdata->bus_num; + ctlr->num_chipselect =3D pdata->max_chipselect; =20 init_completion(&mpc8xxx_spi->done); } --=20 2.43.0 From nobody Thu Nov 14 04:56:27 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 C6E6312E1FF for ; Wed, 7 Feb 2024 18:43:30 +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=1707331415; cv=none; b=IZwDicJ9rmls9/CeYRpWiXq+kGulWbMtDRWugtjPnWH3sSC73x9skZa9/OxB0jF6a7/Yhd+weixInuizbzldm8zqsP4uSCsUSzFhdcsnTzQfrYTgPHwTZGv1y29S3OiwkpEQIBQ2CtIN+Olplp3237l222LBF+O0L1uklrNhnfQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707331415; c=relaxed/simple; bh=uB3EFp1QO1hexwLLVQgbTObbWoAfnWMVl1AIy0DdRhs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=dymoGIE0btWD9WnSXzOH/H4kQmHH1x/oBBxCMz3QHsKfcRRf7lwbqpU5u+gBPDVPvqC0Ro26WYHmZBbcNzuUOAkfVpaV6zo8c7x/IzY9Nsm/P4PAn3jzb5QcK4L9YXhHjLfZB4kcfZcFlOV6z+qU/lp9LYXsInFf913De4Q4M94= 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 1rXmtE-00089Y-UF; Wed, 07 Feb 2024 19:43:20 +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 1rXmtE-0054Ym-3e; Wed, 07 Feb 2024 19:43:20 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rXmtE-00HRtt-05; Wed, 07 Feb 2024 19:43:20 +0100 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: Mark Brown Cc: kernel@pengutronix.de, Jonathan Corbet , Jonathan Cameron , Bjorn Helgaas , Andy Shevchenko , James Clark , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-spi@vger.kernel.org Subject: [PATCH v3 31/32] spi: Drop compat layer from renaming "master" to "controller" Date: Wed, 7 Feb 2024 19:40:45 +0100 Message-ID: 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=3777; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=uB3EFp1QO1hexwLLVQgbTObbWoAfnWMVl1AIy0DdRhs=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlw87m7jcEk6MBx1cg+GuyUSMqcytNRFv3xCFiM 6JtdE0QP2qJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZcPO5gAKCRCPgPtYfRL+ TpzWCACjfAyRML6L8ZOoMmat3fJR2FLO4Aw3vRds41Bmzf0wXRoRCuJhA7rAaSG9rTc8tijCWr5 v9asd7VwhesST11FK/hrFHqlriBG8zT8nYNYJRES2yc3qrVE4+n/t0FJJ1CGTY/TPodjABqLOqH m6XS0WWv9+0WfUNypQk14db+sT8KpDuom7TuwLa4ylkkFfhUkSbzmXXN+vlbaKwTKoDz5Nw5UZG JzXvWjlau2v20A8Zp219c7Jet0Wqb3kjbWPODyIQ3t+35PIfW+YbGhpBe51c5NjMo0R5fbxjhin Ka94760BEZONczT3M69IXKcCp73KaoEm5skKp6ejTi9XbLj7 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 Now that all in-tree users followed the rename, the compat stuff can go away. This completes the renaming started with commit 8caab75fd2c2 ("spi: Generalize SPI "master" to "controller"") Acked-by: Jonathan Cameron Signed-off-by: Uwe Kleine-K=C3=B6nig --- .../driver-api/driver-model/devres.rst | 2 +- drivers/spi/spi.c | 2 +- include/linux/spi/spi.h | 20 +------------------ 3 files changed, 3 insertions(+), 21 deletions(-) diff --git a/Documentation/driver-api/driver-model/devres.rst b/Documentati= on/driver-api/driver-model/devres.rst index c5f99d834ec5..49c6fd82cd5d 100644 --- a/Documentation/driver-api/driver-model/devres.rst +++ b/Documentation/driver-api/driver-model/devres.rst @@ -462,7 +462,7 @@ SLAVE DMA ENGINE SPI devm_spi_alloc_master() devm_spi_alloc_slave() - devm_spi_register_master() + devm_spi_register_controller() =20 WATCHDOG devm_watchdog_register_device() diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 53c25a351dab..c08fe2cb256c 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -584,7 +584,7 @@ struct spi_device *spi_alloc_device(struct spi_controll= er *ctlr) return NULL; } =20 - spi->master =3D spi->controller =3D ctlr; + spi->controller =3D ctlr; spi->dev.parent =3D &ctlr->dev; spi->dev.bus =3D &spi_bus_type; spi->dev.release =3D spidev_release; diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h index 9e3866809a0e..7500db33f70c 100644 --- a/include/linux/spi/spi.h +++ b/include/linux/spi/spi.h @@ -131,7 +131,6 @@ extern void spi_transfer_cs_change_delay_exec(struct sp= i_message *msg, * struct spi_device - Controller side proxy for an SPI slave device * @dev: Driver model representation of the device. * @controller: SPI controller used with the device. - * @master: Copy of controller, for backwards compatibility. * @max_speed_hz: Maximum clock rate to be used with this chip * (on this board); may be changed by the device's driver. * The spi_transfer.speed_hz can override this for each transfer. @@ -185,7 +184,6 @@ extern void spi_transfer_cs_change_delay_exec(struct sp= i_message *msg, struct spi_device { struct device dev; struct spi_controller *controller; - struct spi_controller *master; /* Compatibility layer */ u32 max_speed_hz; u8 chip_select[SPI_CS_CNT_MAX]; u8 bits_per_word; @@ -1298,7 +1296,7 @@ spi_max_transfer_size(struct spi_device *spi) */ static inline bool spi_is_bpw_supported(struct spi_device *spi, u32 bpw) { - u32 bpw_mask =3D spi->master->bits_per_word_mask; + u32 bpw_mask =3D spi->controller->bits_per_word_mask; =20 if (bpw =3D=3D 8 || (bpw <=3D 32 && bpw_mask & SPI_BPW_MASK(bpw))) return true; @@ -1670,20 +1668,4 @@ spi_transfer_is_last(struct spi_controller *ctlr, st= ruct spi_transfer *xfer) return list_is_last(&xfer->transfer_list, &ctlr->cur_msg->transfers); } =20 -/* Compatibility layer */ -#define spi_master spi_controller - -#define spi_master_get_devdata(_ctlr) spi_controller_get_devdata(_ctlr) -#define spi_master_set_devdata(_ctlr, _data) \ - spi_controller_set_devdata(_ctlr, _data) -#define spi_master_get(_ctlr) spi_controller_get(_ctlr) -#define spi_master_put(_ctlr) spi_controller_put(_ctlr) -#define spi_master_suspend(_ctlr) spi_controller_suspend(_ctlr) -#define spi_master_resume(_ctlr) spi_controller_resume(_ctlr) - -#define spi_register_master(_ctlr) spi_register_controller(_ctlr) -#define devm_spi_register_master(_dev, _ctlr) \ - devm_spi_register_controller(_dev, _ctlr) -#define spi_unregister_master(_ctlr) spi_unregister_controller(_ctlr) - #endif /* __LINUX_SPI_H */ --=20 2.43.0 From nobody Thu Nov 14 04:56:27 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 C86D512A142 for ; Wed, 7 Feb 2024 18:43:26 +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=1707331410; cv=none; b=i0D8/HsHe5a+WJlwoxLSluJdyd62d5kztMgA1lsJweYcOKxrMtejnDSu6U3NXqfOPr9N0OlXGgg9kWDyJ0z18yUP8PbEhHqAV5buxfsBw7rrKG0/3Mbfe+p7oKvGuZ/cpa2PUJZTkscHgPpI4XRoAfz98qwcjJQfzUsPaVOJbLk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707331410; c=relaxed/simple; bh=lupNOJTfyldL3mmpGmFMUlRtxlv0yV5K01wD1FM//lU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=R/vOZb2r+SUSc3A/y9rarwjOWs73GPxXhE7dJ4dIQTU3JZzvnZZIukFUe6B51BefO50fP+J9j7RIBPL0uChk7dMh7jJK4/mteBMnUcIHAMHrkuPYMji4nKxY1/N5DObiE4RffVWMJgyHi7yWmuYVQznI2CoOVsZd2SgaMX76RHo= 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 1rXmtF-0008CF-2N; Wed, 07 Feb 2024 19:43:21 +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 1rXmtE-0054Yq-I1; Wed, 07 Feb 2024 19:43:20 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rXmtE-00HRtx-1X; Wed, 07 Feb 2024 19:43:20 +0100 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: Mark Brown Cc: kernel@pengutronix.de, linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Jonathan Cameron Subject: [PATCH v3 32/32] Documentation: spi: Update documentation for renaming "master" to "controller" Date: Wed, 7 Feb 2024 19:40:46 +0100 Message-ID: <3d643e22cacff12d3918ad5224baa1d01813d03b.1707324794.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=10646; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=lupNOJTfyldL3mmpGmFMUlRtxlv0yV5K01wD1FM//lU=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlw87sFPC2ubYJeQTZiACVo+Y+sBdgqZYeH8PWh 9hnwOjmkoCJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZcPO7AAKCRCPgPtYfRL+ ToR2B/9ipdkmLVRM5BbNknVUv/GZaKE+W7/96VxDH3aIJElcdW3Dxbj3Ow7+KVu2H/ffas2Eg7W IFr9Hq0vYqwIYRDE4dTStFhKAQuV7Zl9XCq8jmJEaf2uxybCWs3VCjZkaAlod9QHvQhr2R2QeOS csGnlKxpQyPSQTGJJII7rQ8wgqbXVALzk2Oq3cAlas9NI7Xg8ZzUd+4qYTZBKoZFz0+E3cJDycU PggD4RMiFyrl31tfipCSBqbveM802kNc5+wfGvEsYbt6Yp7rwD8rCvdHs9vfn7U14VchIOSox3B qllTlYfFOqlQwXdm6UjwaHOpoLM9t7gAibGHLFmy1jr1M0Gb 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. Adapt the documentation accordingly. Acked-by: Jonathan Cameron Signed-off-by: Uwe Kleine-K=C3=B6nig --- Documentation/spi/spi-summary.rst | 74 +++++++++++++++---------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/Documentation/spi/spi-summary.rst b/Documentation/spi/spi-summ= ary.rst index 33f05901ccf3..e714472007f1 100644 --- a/Documentation/spi/spi-summary.rst +++ b/Documentation/spi/spi-summary.rst @@ -9,7 +9,7 @@ What is SPI? The "Serial Peripheral Interface" (SPI) is a synchronous four wire serial link used to connect microcontrollers to sensors, memory, and peripherals. It's a simple "de facto" standard, not complicated enough to acquire a -standardization body. SPI uses a master/slave configuration. +standardization body. SPI uses a host/target configuration. =20 The three signal wires hold a clock (SCK, often on the order of 10 MHz), and parallel data lines with "Master Out, Slave In" (MOSI) or "Master In, @@ -19,11 +19,11 @@ commonly used. Each clock cycle shifts data out and da= ta in; the clock doesn't cycle except when there is a data bit to shift. Not all data bits are used though; not every protocol uses those full duplex capabilities. =20 -SPI masters use a fourth "chip select" line to activate a given SPI slave +SPI hosts use a fourth "chip select" line to activate a given SPI slave device, so those three signal wires may be connected to several chips in parallel. All SPI slaves support chipselects; they are usually active low signals, labeled nCSx for slave 'x' (e.g. nCS0). Some devices have -other signals, often including an interrupt to the master. +other signals, often including an interrupt to the host. =20 Unlike serial busses like USB or SMBus, even low level protocols for SPI slave functions are usually not interoperable between vendors @@ -45,8 +45,8 @@ SPI slave functions are usually not interoperable between= vendors =20 In the same way, SPI slaves will only rarely support any kind of automatic discovery/enumeration protocol. The tree of slave devices accessible from -a given SPI master will normally be set up manually, with configuration -tables. +a given SPI host controller will normally be set up manually, with +configuration tables. =20 SPI is only one of the names used by such four-wire protocols, and most controllers have no problem handling "MicroWire" (think of it as @@ -62,8 +62,8 @@ course they won't handle full duplex transfers. You may = find such chips described as using "three wire" signaling: SCK, data, nCSx. (That data line is sometimes called MOMI or SISO.) =20 -Microcontrollers often support both master and slave sides of the SPI -protocol. This document (and Linux) supports both the master and slave +Microcontrollers often support both host and target sides of the SPI +protocol. This document (and Linux) supports both the host and target sides of SPI interactions. =20 =20 @@ -118,7 +118,7 @@ starting low (CPOL=3D0) and data stabilized for samplin= g during the trailing clock edge (CPHA=3D1), that's SPI mode 1. =20 Note that the clock mode is relevant as soon as the chipselect goes -active. So the master must set the clock to inactive before selecting +active. So the host must set the clock to inactive before selecting a slave, and the slave can tell the chosen polarity by sampling the clock level when its select line goes active. That's why many devices support for example both modes 0 and 3: they don't care about polarity, @@ -179,7 +179,7 @@ shows up in sysfs in several locations:: /sys/bus/spi/drivers/D ... driver for one or more spi*.* devices =20 /sys/class/spi_master/spiB ... symlink to a logical node which could ho= ld - class related state for the SPI master controller managing bus "B". + class related state for the SPI host controller managing bus "B". All spiB.* devices share one physical SPI bus segment, with SCLK, MOSI, and MISO. =20 @@ -316,7 +316,7 @@ sharing a bus with a device that interprets chipselect = "backwards" is not possible until the infrastructure knows how to deselect it. =20 Then your board initialization code would register that table with the SPI -infrastructure, so that it's available later when the SPI master controller +infrastructure, so that it's available later when the SPI host controller driver is registered:: =20 spi_register_board_info(spi_board_info, ARRAY_SIZE(spi_board_info)); @@ -474,34 +474,34 @@ How do I write an "SPI Master Controller Driver"? An SPI controller will probably be registered on the platform_bus; write a driver to bind to the device, whichever bus is involved. =20 -The main task of this type of driver is to provide an "spi_master". -Use spi_alloc_master() to allocate the master, and spi_master_get_devdata() -to get the driver-private data allocated for that device. +The main task of this type of driver is to provide an "spi_controller". +Use spi_alloc_host() to allocate the host controller, and +spi_controller_get_devdata() to get the driver-private data allocated for = that +device. =20 :: =20 - struct spi_master *master; + struct spi_controller *ctlr; struct CONTROLLER *c; =20 - master =3D spi_alloc_master(dev, sizeof *c); - if (!master) + ctlr =3D spi_alloc_host(dev, sizeof *c); + if (!ctlr) return -ENODEV; =20 - c =3D spi_master_get_devdata(master); + c =3D spi_controller_get_devdata(ctlr); =20 -The driver will initialize the fields of that spi_master, including the -bus number (maybe the same as the platform device ID) and three methods -used to interact with the SPI core and SPI protocol drivers. It will -also initialize its own internal state. (See below about bus numbering -and those methods.) +The driver will initialize the fields of that spi_controller, including th= e bus +number (maybe the same as the platform device ID) and three methods used to +interact with the SPI core and SPI protocol drivers. It will also initial= ize +its own internal state. (See below about bus numbering and those methods.) =20 -After you initialize the spi_master, then use spi_register_master() to +After you initialize the spi_controller, then use spi_register_controller(= ) to publish it to the rest of the system. At that time, device nodes for the controller and any predeclared spi devices will be made available, and the driver model core will take care of binding them to drivers. =20 -If you need to remove your SPI controller driver, spi_unregister_master() -will reverse the effect of spi_register_master(). +If you need to remove your SPI controller driver, spi_unregister_controlle= r() +will reverse the effect of spi_register_controller(). =20 =20 Bus Numbering @@ -519,10 +519,10 @@ then be replaced by a dynamically assigned number. Yo= u'd then need to treat this as a non-static configuration (see above). =20 =20 -SPI Master Methods -^^^^^^^^^^^^^^^^^^ +SPI Host Controller Methods +^^^^^^^^^^^^^^^^^^^^^^^^^^^ =20 -``master->setup(struct spi_device *spi)`` +``ctlr->setup(struct spi_device *spi)`` This sets up the device clock rate, SPI mode, and word sizes. Drivers may change the defaults provided by board_info, and then call spi_setup(spi) to invoke this routine. It may sleep. @@ -534,34 +534,34 @@ SPI Master Methods .. note:: =20 BUG ALERT: for some reason the first version of - many spi_master drivers seems to get this wrong. + many spi_controller drivers seems to get this wrong. When you code setup(), ASSUME that the controller is actively processing transfers for another device. =20 -``master->cleanup(struct spi_device *spi)`` +``ctlr->cleanup(struct spi_device *spi)`` Your controller driver may use spi_device.controller_state to hold state it dynamically associates with that device. If you do that, be sure to provide the cleanup() method to free that state. =20 -``master->prepare_transfer_hardware(struct spi_master *master)`` +``ctlr->prepare_transfer_hardware(struct spi_controller *ctlr)`` This will be called by the queue mechanism to signal to the driver that a message is coming in soon, so the subsystem requests the driver to prepare the transfer hardware by issuing this call. This may sleep. =20 -``master->unprepare_transfer_hardware(struct spi_master *master)`` +``ctlr->unprepare_transfer_hardware(struct spi_controller *ctlr)`` This will be called by the queue mechanism to signal to the driver that there are no more messages pending in the queue and it may relax the hardware (e.g. by power management calls). This may sleep. =20 -``master->transfer_one_message(struct spi_master *master, struct spi_messa= ge *mesg)`` +``ctlr->transfer_one_message(struct spi_controller *ctlr, struct spi_messa= ge *mesg)`` The subsystem calls the driver to transfer a single message while queuing transfers that arrive in the meantime. When the driver is finished with this message, it must call spi_finalize_current_message() so the subsystem can issue the next message. This may sleep. =20 -``master->transfer_one(struct spi_master *master, struct spi_device *spi, = struct spi_transfer *transfer)`` +``ctrl->transfer_one(struct spi_controller *ctlr, struct spi_device *spi, = struct spi_transfer *transfer)`` The subsystem calls the driver to transfer a single transfer while queuing transfers that arrive in the meantime. When the driver is finished with this transfer, it must call @@ -576,15 +576,15 @@ SPI Master Methods * 0: transfer is finished * 1: transfer is still in progress =20 -``master->set_cs_timing(struct spi_device *spi, u8 setup_clk_cycles, u8 ho= ld_clk_cycles, u8 inactive_clk_cycles)`` - This method allows SPI client drivers to request SPI master controller +``ctrl->set_cs_timing(struct spi_device *spi, u8 setup_clk_cycles, u8 hold= _clk_cycles, u8 inactive_clk_cycles)`` + This method allows SPI client drivers to request SPI host controller for configuring device specific CS setup, hold and inactive timing requirements. =20 Deprecated Methods ^^^^^^^^^^^^^^^^^^ =20 -``master->transfer(struct spi_device *spi, struct spi_message *message)`` +``ctrl->transfer(struct spi_device *spi, struct spi_message *message)`` This must not sleep. Its responsibility is to arrange that the transfer happens and its complete() callback is issued. The two will normally happen later, after other transfers complete, and --=20 2.43.0