drop queue-4.19/memory-mvebu-devbus-fix-missing-clk_disable_unprepar.patch

diff --git a/queue-4.19/memory-mvebu-devbus-fix-missing-clk_disable_unprepar.patch b/queue-4.19/memory-mvebu-devbus-fix-missing-clk_disable_unprepar.patch
deleted file mode 100644 (file)
index fcde5a4..0000000
--- a/queue-4.19/memory-mvebu-devbus-fix-missing-clk_disable_unprepar.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 52133d336da1b2a2fea42bd67a06a671d3be8797 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Sat, 26 Nov 2022 12:49:11 +0800
-Subject: memory: mvebu-devbus: Fix missing clk_disable_unprepare in
- mvebu_devbus_probe()
-
-From: Gaosheng Cui <cuigaosheng1@huawei.com>
-
-[ Upstream commit cb8fd6f75775165390ededea8799b60d93d9fe3e ]
-
-The clk_disable_unprepare() should be called in the error handling
-of devbus_get_timing_params() and of_platform_populate(), fix it by
-replacing devm_clk_get and clk_prepare_enable by devm_clk_get_enabled.
-
-Fixes: e81b6abebc87 ("memory: add a driver for atmel ram controllers")
-Signed-off-by: Gaosheng Cui <cuigaosheng1@huawei.com>
-Link: https://lore.kernel.org/r/20221126044911.7226-1-cuigaosheng1@huawei.com
-Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/memory/mvebu-devbus.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/drivers/memory/mvebu-devbus.c b/drivers/memory/mvebu-devbus.c
-index 981860879d02..ddd2e50814b7 100644
---- a/drivers/memory/mvebu-devbus.c
-+++ b/drivers/memory/mvebu-devbus.c
-@@ -294,10 +294,9 @@ static int mvebu_devbus_probe(struct platform_device *pdev)
-       if (IS_ERR(devbus->base))
-               return PTR_ERR(devbus->base);
- 
--      clk = devm_clk_get(&pdev->dev, NULL);
-+      clk = devm_clk_get_enabled(&pdev->dev, NULL);
-       if (IS_ERR(clk))
-               return PTR_ERR(clk);
--      clk_prepare_enable(clk);
- 
-       /*
-        * Obtain clock period in picoseconds,
--- 
-2.39.0
-

diff --git a/queue-4.19/series b/queue-4.19/series
index f2d0b7a9cb7a629f07a12119c765ccf9d25e1971..4b6ac9311dae91e025de3ccd67592f799689cbba 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -1,4 +1,3 @@
-memory-mvebu-devbus-fix-missing-clk_disable_unprepar.patch
 arm-dts-imx6qdl-gw560x-remove-incorrect-uart-has-rts.patch
 hid-intel_ish-hid-add-check-for-ishtp_dma_tx_map.patch
 edac-highbank-fix-memory-leak-in-highbank_mc_probe.patch