target/linux/generic/backport-5.15/819-v6.6-0007-nvmem-qfprom-do-some-cleanup.patch

   1 From 0bc0d6dc2a9a05ae6729b4622f09782d9f230815 Mon Sep 17 00:00:00 2001
   2 From: Yangtao Li <frank.li@vivo.com>
   3 Date: Wed, 23 Aug 2023 14:27:30 +0100
   4 Subject: [PATCH] nvmem: qfprom: do some cleanup
   5
   6 Use devm_platform_ioremap_resource() and
   7 devm_platform_get_and_ioremap_resource() to simplify code.
   8 BTW convert to use dev_err_probe() instead of open it.
   9
  10 Signed-off-by: Yangtao Li <frank.li@vivo.com>
  11 Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
  12 Link: https://lore.kernel.org/r/20230823132744.350618-9-srinivas.kandagatla@linaro.org
  13 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  14 ---
  15  drivers/nvmem/qfprom.c | 17 +++++------------
  16  1 file changed, 5 insertions(+), 12 deletions(-)
  17
  18 --- a/drivers/nvmem/qfprom.c
  19 +++ b/drivers/nvmem/qfprom.c
  20 @@ -374,8 +374,7 @@ static int qfprom_probe(struct platform_
  21                 return -ENOMEM;
  22
  23         /* The corrected section is always provided */
  24 -       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
  25 -       priv->qfpcorrected = devm_ioremap_resource(dev, res);
  26 +       priv->qfpcorrected = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
  27         if (IS_ERR(priv->qfpcorrected))
  28                 return PTR_ERR(priv->qfpcorrected);
  29
  30 @@ -402,12 +401,10 @@ static int qfprom_probe(struct platform_
  31                 priv->qfpraw = devm_ioremap_resource(dev, res);
  32                 if (IS_ERR(priv->qfpraw))
  33                         return PTR_ERR(priv->qfpraw);
  34 -               res = platform_get_resource(pdev, IORESOURCE_MEM, 2);
  35 -               priv->qfpconf = devm_ioremap_resource(dev, res);
  36 +               priv->qfpconf = devm_platform_ioremap_resource(pdev, 2);
  37                 if (IS_ERR(priv->qfpconf))
  38                         return PTR_ERR(priv->qfpconf);
  39 -               res = platform_get_resource(pdev, IORESOURCE_MEM, 3);
  40 -               priv->qfpsecurity = devm_ioremap_resource(dev, res);
  41 +               priv->qfpsecurity = devm_platform_ioremap_resource(pdev, 3);
  42                 if (IS_ERR(priv->qfpsecurity))
  43                         return PTR_ERR(priv->qfpsecurity);
  44
  45 @@ -427,12 +424,8 @@ static int qfprom_probe(struct platform_
  46                         return PTR_ERR(priv->vcc);
  47
  48                 priv->secclk = devm_clk_get(dev, "core");
  49 -               if (IS_ERR(priv->secclk)) {
  50 -                       ret = PTR_ERR(priv->secclk);
  51 -                       if (ret != -EPROBE_DEFER)
  52 -                               dev_err(dev, "Error getting clock: %d\n", ret);
  53 -                       return ret;
  54 -               }
  55 +               if (IS_ERR(priv->secclk))
  56 +                       return dev_err_probe(dev, PTR_ERR(priv->secclk), "Error getting clock\n");
  57
  58                 /* Only enable writing if we have SoC data. */
  59                 if (priv->soc_data)