|
|
@@ -1,52 +0,0 @@
|
|
|
-From 8af60f5b0aa5b33525379d2859c8581b3472f9ea Mon Sep 17 00:00:00 2001
|
|
|
-From: Daniel Golle <[email protected]>
|
|
|
-Date: Fri, 28 Jan 2022 13:25:46 +0000
|
|
|
-Subject: [PATCH] Revert "ASoC: mediatek: Check for error clk pointer"
|
|
|
-
|
|
|
-This reverts commit 9de2b9286a6dd16966959b3cb34fc2ddfd39213e.
|
|
|
----
|
|
|
- drivers/soc/mediatek/mtk-scpsys.c | 15 ++++-----------
|
|
|
- 1 file changed, 4 insertions(+), 11 deletions(-)
|
|
|
-
|
|
|
---- a/drivers/soc/mediatek/mtk-scpsys.c
|
|
|
-+++ b/drivers/soc/mediatek/mtk-scpsys.c
|
|
|
-@@ -411,17 +411,12 @@ out:
|
|
|
- return ret;
|
|
|
- }
|
|
|
-
|
|
|
--static int init_clks(struct platform_device *pdev, struct clk **clk)
|
|
|
-+static void init_clks(struct platform_device *pdev, struct clk **clk)
|
|
|
- {
|
|
|
- int i;
|
|
|
-
|
|
|
-- for (i = CLK_NONE + 1; i < CLK_MAX; i++) {
|
|
|
-+ for (i = CLK_NONE + 1; i < CLK_MAX; i++)
|
|
|
- clk[i] = devm_clk_get(&pdev->dev, clk_names[i]);
|
|
|
-- if (IS_ERR(clk[i]))
|
|
|
-- return PTR_ERR(clk[i]);
|
|
|
-- }
|
|
|
--
|
|
|
-- return 0;
|
|
|
- }
|
|
|
-
|
|
|
- static struct scp *init_scp(struct platform_device *pdev,
|
|
|
-@@ -431,7 +426,7 @@ static struct scp *init_scp(struct platf
|
|
|
- {
|
|
|
- struct genpd_onecell_data *pd_data;
|
|
|
- struct resource *res;
|
|
|
-- int i, j, ret;
|
|
|
-+ int i, j;
|
|
|
- struct scp *scp;
|
|
|
- struct clk *clk[CLK_MAX];
|
|
|
-
|
|
|
-@@ -486,9 +481,7 @@ static struct scp *init_scp(struct platf
|
|
|
-
|
|
|
- pd_data->num_domains = num;
|
|
|
-
|
|
|
-- ret = init_clks(pdev, clk);
|
|
|
-- if (ret)
|
|
|
-- return ERR_PTR(ret);
|
|
|
-+ init_clks(pdev, clk);
|
|
|
-
|
|
|
- for (i = 0; i < num; i++) {
|
|
|
- struct scp_domain *scpd = &scp->domains[i];
|
John Audia