860-Revert-ASoC-mediatek-Check-for-error-clk-pointer.patch 1.4 KB

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