target/linux/generic/pending-5.10/860-Revert-ASoC-mediatek-Check-for-error-clk-pointer.patch

   1 From 8af60f5b0aa5b33525379d2859c8581b3472f9ea Mon Sep 17 00:00:00 2001
   2 From: Daniel Golle <daniel@makrotopia.org>
   3 Date: Fri, 28 Jan 2022 13:25:46 +0000
   4 Subject: [PATCH] Revert "ASoC: mediatek: Check for error clk pointer"
   5
   6 This reverts commit 9de2b9286a6dd16966959b3cb34fc2ddfd39213e.
   7 ---
   8  drivers/soc/mediatek/mtk-scpsys.c | 15 ++++-----------
   9  1 file changed, 4 insertions(+), 11 deletions(-)
  10
  11 --- a/drivers/soc/mediatek/mtk-scpsys.c
  12 +++ b/drivers/soc/mediatek/mtk-scpsys.c
  13 @@ -411,17 +411,12 @@ out:
  14         return ret;
  15  }
  16
  17 -static int init_clks(struct platform_device *pdev, struct clk **clk)
  18 +static void init_clks(struct platform_device *pdev, struct clk **clk)
  19  {
  20         int i;
  21
  22 -       for (i = CLK_NONE + 1; i < CLK_MAX; i++) {
  23 +       for (i = CLK_NONE + 1; i < CLK_MAX; i++)
  24                 clk[i] = devm_clk_get(&pdev->dev, clk_names[i]);
  25 -               if (IS_ERR(clk[i]))
  26 -                       return PTR_ERR(clk[i]);
  27 -       }
  28 -
  29 -       return 0;
  30  }
  31
  32  static struct scp *init_scp(struct platform_device *pdev,
  33 @@ -431,7 +426,7 @@ static struct scp *init_scp(struct platf
  34  {
  35         struct genpd_onecell_data *pd_data;
  36         struct resource *res;
  37 -       int i, j, ret;
  38 +       int i, j;
  39         struct scp *scp;
  40         struct clk *clk[CLK_MAX];
  41
  42 @@ -486,9 +481,7 @@ static struct scp *init_scp(struct platf
  43
  44         pd_data->num_domains = num;
  45
  46 -       ret = init_clks(pdev, clk);
  47 -       if (ret)
  48 -               return ERR_PTR(ret);
  49 +       init_clks(pdev, clk);
  50
  51         for (i = 0; i < num; i++) {
  52                 struct scp_domain *scpd = &scp->domains[i];