fix up queue-6.1/spi-zynqmp-gqspi-fix-clock-imbalance-on-probe-failur.patch

diff --git a/queue-6.1/series b/queue-6.1/series
index ac04403ea34406dc769abdff6f251197e885f26c..7040b6cd195a0aabbc0d8fda1820e4d4345495f0 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -1,4 +1,3 @@
-spi-zynqmp-gqspi-convert-to-platform-remove-callback.patch
 spi-zynqmp-gqspi-fix-clock-imbalance-on-probe-failur.patch
 asoc-soc-utils-export-snd_soc_dai_is_dummy-symbol.patch
 asoc-tegra-fix-redundant-plla-and-plla_out0-updates.patch

diff --git a/queue-6.1/spi-zynqmp-gqspi-convert-to-platform-remove-callback.patch b/queue-6.1/spi-zynqmp-gqspi-convert-to-platform-remove-callback.patch
deleted file mode 100644 (file)
index 1684da5..0000000
--- a/queue-6.1/spi-zynqmp-gqspi-convert-to-platform-remove-callback.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From a0dd03214a34d747df5a47cacec49c4693890454 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 3 Mar 2023 18:20:41 +0100
-Subject: spi: zynqmp-gqspi: Convert to platform remove callback returning void
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
-
-[ Upstream commit 3ffefa1d9c9eba60c7f8b4a9ce2df3e4c7f4a88e ]
-
-The .remove() callback for a platform driver returns an int which makes
-many driver authors wrongly assume it's possible to do error handling by
-returning an error code. However the value returned is (mostly) ignored
-and this typically results in resource leaks. To improve here there is a
-quest to make the remove callback return void. In the first step of this
-quest all drivers are converted to .remove_new() which already returns
-void.
-
-Trivially convert this driver from always returning zero in the remove
-callback to the void returning variant.
-
-Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
-Link: https://lore.kernel.org/r/20230303172041.2103336-88-u.kleine-koenig@pengutronix.de
-Signed-off-by: Mark Brown <broonie@kernel.org>
-Stable-dep-of: 1527b076ae2c ("spi: zynqmp-gqspi: fix clock imbalance on probe failure")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/spi/spi-zynqmp-gqspi.c | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/spi/spi-zynqmp-gqspi.c b/drivers/spi/spi-zynqmp-gqspi.c
-index c760aac070e54..876a41c5d1664 100644
---- a/drivers/spi/spi-zynqmp-gqspi.c
-+++ b/drivers/spi/spi-zynqmp-gqspi.c
-@@ -1240,7 +1240,7 @@ static int zynqmp_qspi_probe(struct platform_device *pdev)
-  *
-  * Return:    0 Always
-  */
--static int zynqmp_qspi_remove(struct platform_device *pdev)
-+static void zynqmp_qspi_remove(struct platform_device *pdev)
- {
-       struct zynqmp_qspi *xqspi = platform_get_drvdata(pdev);
- 
-@@ -1249,8 +1249,6 @@ static int zynqmp_qspi_remove(struct platform_device *pdev)
-       clk_disable_unprepare(xqspi->pclk);
-       pm_runtime_set_suspended(&pdev->dev);
-       pm_runtime_disable(&pdev->dev);
--
--      return 0;
- }
- 
- static const struct of_device_id zynqmp_qspi_of_match[] = {
-@@ -1262,7 +1260,7 @@ MODULE_DEVICE_TABLE(of, zynqmp_qspi_of_match);
- 
- static struct platform_driver zynqmp_qspi_driver = {
-       .probe = zynqmp_qspi_probe,
--      .remove = zynqmp_qspi_remove,
-+      .remove_new = zynqmp_qspi_remove,
-       .driver = {
-               .name = "zynqmp-qspi",
-               .of_match_table = zynqmp_qspi_of_match,
--- 
-2.40.1
-

diff --git a/queue-6.1/spi-zynqmp-gqspi-fix-clock-imbalance-on-probe-failur.patch b/queue-6.1/spi-zynqmp-gqspi-fix-clock-imbalance-on-probe-failur.patch
index c3a7d52266ac5dd3d7fc0394ac1be99d3f5c44d2..89ddbab62bf2fc22c5dcf1d24617fc66c8367eb7 100644 (file)
--- a/queue-6.1/spi-zynqmp-gqspi-fix-clock-imbalance-on-probe-failur.patch
+++ b/queue-6.1/spi-zynqmp-gqspi-fix-clock-imbalance-on-probe-failur.patch
@@ -20,14 +20,12 @@ Link: https://lore.kernel.org/r/Message-Id: <20230622082435.7873-1-johan+linaro@
 Signed-off-by: Mark Brown <broonie@kernel.org>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- drivers/spi/spi-zynqmp-gqspi.c | 12 ++++++++----
+ drivers/spi/spi-zynqmp-gqspi.c |   12 ++++++++----
  1 file changed, 8 insertions(+), 4 deletions(-)
 
-diff --git a/drivers/spi/spi-zynqmp-gqspi.c b/drivers/spi/spi-zynqmp-gqspi.c
-index 876a41c5d1664..f2dcd1ae77c7d 100644
 --- a/drivers/spi/spi-zynqmp-gqspi.c
 +++ b/drivers/spi/spi-zynqmp-gqspi.c
-@@ -1218,9 +1218,9 @@ static int zynqmp_qspi_probe(struct platform_device *pdev)
+@@ -1218,9 +1218,9 @@ static int zynqmp_qspi_probe(struct plat
        return 0;
  
  clk_dis_all:
@@ -39,7 +37,7 @@ index 876a41c5d1664..f2dcd1ae77c7d 100644
        clk_disable_unprepare(xqspi->refclk);
  clk_dis_pclk:
        clk_disable_unprepare(xqspi->pclk);
-@@ -1244,11 +1244,15 @@ static void zynqmp_qspi_remove(struct platform_device *pdev)
+@@ -1244,11 +1244,15 @@ static int zynqmp_qspi_remove(struct pla
  {
        struct zynqmp_qspi *xqspi = platform_get_drvdata(pdev);
  
@@ -54,9 +52,6 @@ index 876a41c5d1664..f2dcd1ae77c7d 100644
        clk_disable_unprepare(xqspi->pclk);
 -      pm_runtime_set_suspended(&pdev->dev);
 -      pm_runtime_disable(&pdev->dev);
- }
  
- static const struct of_device_id zynqmp_qspi_of_match[] = {
--- 
-2.40.1
-
+       return 0;
+ }