Re: [PATCH v2 01/13] memory: atmel-ebi: use scoped device node handling to simplify error paths

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 16/08/2024 at 12:54, Krzysztof Kozlowski wrote:
Obtain the device node reference with scoped/cleanup.h to reduce error
handling and make the code a bit simpler.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxx>

Acked-by: Nicolas Ferre <nicolas.ferre@xxxxxxxxxxxxx>
Best regards,
  Nicolas


---

Changes in v2:
1. Wrap line before of_parse_phandle()
---
  drivers/memory/atmel-ebi.c | 29 ++++++++++-------------------
  1 file changed, 10 insertions(+), 19 deletions(-)

diff --git a/drivers/memory/atmel-ebi.c b/drivers/memory/atmel-ebi.c
index e8bb5f37f5cb..8f5b3302ee30 100644
--- a/drivers/memory/atmel-ebi.c
+++ b/drivers/memory/atmel-ebi.c
@@ -6,6 +6,7 @@
   * Copyright (C) 2013 Jean-Jacques Hiblot <jjhiblot@xxxxxxxxxxxxxxx>
   */

+#include <linux/cleanup.h>
  #include <linux/clk.h>
  #include <linux/io.h>
  #include <linux/mfd/syscon.h>
@@ -517,7 +518,7 @@ static int atmel_ebi_dev_disable(struct atmel_ebi *ebi, struct device_node *np)
  static int atmel_ebi_probe(struct platform_device *pdev)
  {
         struct device *dev = &pdev->dev;
-       struct device_node *child, *np = dev->of_node, *smc_np;
+       struct device_node *child, *np = dev->of_node;
         struct atmel_ebi *ebi;
         int ret, reg_cells;
         struct clk *clk;
@@ -541,30 +542,24 @@ static int atmel_ebi_probe(struct platform_device *pdev)

         ebi->clk = clk;

-       smc_np = of_parse_phandle(dev->of_node, "atmel,smc", 0);
+       struct device_node *smc_np __free(device_node) =
+               of_parse_phandle(dev->of_node, "atmel,smc", 0);

         ebi->smc.regmap = syscon_node_to_regmap(smc_np);
-       if (IS_ERR(ebi->smc.regmap)) {
-               ret = PTR_ERR(ebi->smc.regmap);
-               goto put_node;
-       }
+       if (IS_ERR(ebi->smc.regmap))
+               return PTR_ERR(ebi->smc.regmap);

         ebi->smc.layout = atmel_hsmc_get_reg_layout(smc_np);
-       if (IS_ERR(ebi->smc.layout)) {
-               ret = PTR_ERR(ebi->smc.layout);
-               goto put_node;
-       }
+       if (IS_ERR(ebi->smc.layout))
+               return PTR_ERR(ebi->smc.layout);

         ebi->smc.clk = of_clk_get(smc_np, 0);
         if (IS_ERR(ebi->smc.clk)) {
-               if (PTR_ERR(ebi->smc.clk) != -ENOENT) {
-                       ret = PTR_ERR(ebi->smc.clk);
-                       goto put_node;
-               }
+               if (PTR_ERR(ebi->smc.clk) != -ENOENT)
+                       return PTR_ERR(ebi->smc.clk);

                 ebi->smc.clk = NULL;
         }
-       of_node_put(smc_np);
         ret = clk_prepare_enable(ebi->smc.clk);
         if (ret)
                 return ret;
@@ -615,10 +610,6 @@ static int atmel_ebi_probe(struct platform_device *pdev)
         }

         return of_platform_populate(np, NULL, NULL, dev);
-
-put_node:
-       of_node_put(smc_np);
-       return ret;
  }

  static __maybe_unused int atmel_ebi_resume(struct device *dev)

--
2.43.0






[Index of Archives]     [Linux SoC Development]     [Linux Rockchip Development]     [Linux for Synopsys ARC Processors]    
  • [Linux on Unisoc (RDA Micro) SoCs]     [Linux Actions SoC]     [Linux USB Development]     [Video for Linux]     [Linux Audio Users]     [Linux SCSI]     [Yosemite News]

  •   Powered by Linux