drop queue-5.15/mmc-mtk-sd-fix-missing-clk_disable_unprepare-in-msdc_of_clock_parse...

breaks the build

diff --git a/queue-5.15/mmc-mtk-sd-fix-missing-clk_disable_unprepare-in-msdc_of_clock_parse.patch b/queue-5.15/mmc-mtk-sd-fix-missing-clk_disable_unprepare-in-msdc_of_clock_parse.patch
deleted file mode 100644 (file)
index 7ddd7ef..0000000
--- a/queue-5.15/mmc-mtk-sd-fix-missing-clk_disable_unprepare-in-msdc_of_clock_parse.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From c61bfb1cb63ddab52b31cf5f1924688917e61fad Mon Sep 17 00:00:00 2001
-From: Gaosheng Cui <cuigaosheng1@huawei.com>
-Date: Fri, 25 Nov 2022 17:01:41 +0800
-Subject: mmc: mtk-sd: Fix missing clk_disable_unprepare in msdc_of_clock_parse()
-
-From: Gaosheng Cui <cuigaosheng1@huawei.com>
-
-commit c61bfb1cb63ddab52b31cf5f1924688917e61fad upstream.
-
-The clk_disable_unprepare() should be called in the error handling
-of devm_clk_bulk_get_optional, fix it by replacing devm_clk_get_optional
-and clk_prepare_enable by devm_clk_get_optional_enabled.
-
-Fixes: f5eccd94b63f ("mmc: mediatek: Add subsys clock control for MT8192 msdc")
-Signed-off-by: Gaosheng Cui <cuigaosheng1@huawei.com>
-Cc: stable@vger.kernel.org
-Link: https://lore.kernel.org/r/20221125090141.3626747-1-cuigaosheng1@huawei.com
-Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/mmc/host/mtk-sd.c |    6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
---- a/drivers/mmc/host/mtk-sd.c
-+++ b/drivers/mmc/host/mtk-sd.c
-@@ -2455,13 +2455,11 @@ static int msdc_of_clock_parse(struct pl
-       if (IS_ERR(host->src_clk_cg))
-               host->src_clk_cg = NULL;
- 
--      host->sys_clk_cg = devm_clk_get_optional(&pdev->dev, "sys_cg");
-+      /* If present, always enable for this clock gate */
-+      host->sys_clk_cg = devm_clk_get_optional_enabled(&pdev->dev, "sys_cg");
-       if (IS_ERR(host->sys_clk_cg))
-               host->sys_clk_cg = NULL;
- 
--      /* If present, always enable for this clock gate */
--      clk_prepare_enable(host->sys_clk_cg);
--
-       host->bulk_clks[0].id = "pclk_cg";
-       host->bulk_clks[1].id = "axi_cg";
-       host->bulk_clks[2].id = "ahb_cg";

diff --git a/queue-5.15/series b/queue-5.15/series
index caae50ea1239157aaea3150acde96b728445efa0..fae948a38fcb166986bc8df5f299f1478b8eaeaf 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -74,7 +74,6 @@ pinctrl-intel-save-and-restore-pins-in-direct-irq-mode.patch
 v4l2-don-t-fall-back-to-follow_pfn-if-pin_user_pages_fast-fails.patch
 net-stmmac-set-mac-s-flow-control-register-to-reflect-current-settings.patch
 mmc-mmc_test-fix-removal-of-debugfs-file.patch
-mmc-mtk-sd-fix-missing-clk_disable_unprepare-in-msdc_of_clock_parse.patch
 mmc-core-fix-ambiguous-trim-and-discard-arg.patch
 mmc-sdhci-esdhc-imx-correct-cqhci-exit-halt-state-check.patch
 mmc-sdhci-sprd-fix-no-reset-data-and-command-after-voltage-switch.patch