korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 04:18:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

memory: atmel-ebi: use scoped device node handling to simplify error paths

Browse Source 
Obtain the device node reference with scoped/cleanup.h to reduce error
handling and make the code a bit simpler.

Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Link: https://lore.kernel.org/r/20240816-cleanup-h-of-node-put-memory-v2-1-9eed0ee16b78@linaro.org
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
This commit is contained in:
Krzysztof Kozlowski 2024-08-16 12:54:25 +02:00
parent eba8a7b05e
commit d47d52554d
1 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/memory/atmel-ebi.c
View File

@ -6,6 +6,7 @@
* Copyright (C) 2013 Jean-Jacques Hiblot <jjhiblot@traphandler.com> * Copyright (C) 2013 Jean-Jacques Hiblot <jjhiblot@traphandler.com>
*/ */
#include <linux/cleanup.h>
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/mfd/syscon.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) static int atmel_ebi_probe(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev; 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; struct atmel_ebi *ebi;
int ret, reg_cells; int ret, reg_cells;
struct clk *clk; struct clk *clk;
@ -541,30 +542,24 @@ static int atmel_ebi_probe(struct platform_device *pdev)
ebi->clk = clk; 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); ebi->smc.regmap = syscon_node_to_regmap(smc_np);
if (IS_ERR(ebi->smc.regmap)) { if (IS_ERR(ebi->smc.regmap))
ret = PTR_ERR(ebi->smc.regmap); return PTR_ERR(ebi->smc.regmap);
goto put_node;
}
ebi->smc.layout = atmel_hsmc_get_reg_layout(smc_np); ebi->smc.layout = atmel_hsmc_get_reg_layout(smc_np);
if (IS_ERR(ebi->smc.layout)) { if (IS_ERR(ebi->smc.layout))
ret = PTR_ERR(ebi->smc.layout); return PTR_ERR(ebi->smc.layout);
goto put_node;
}
ebi->smc.clk = of_clk_get(smc_np, 0); ebi->smc.clk = of_clk_get(smc_np, 0);
if (IS_ERR(ebi->smc.clk)) { if (IS_ERR(ebi->smc.clk)) {
if (PTR_ERR(ebi->smc.clk) != -ENOENT) { if (PTR_ERR(ebi->smc.clk) != -ENOENT)
ret = PTR_ERR(ebi->smc.clk); return PTR_ERR(ebi->smc.clk);
goto put_node;
}
ebi->smc.clk = NULL; ebi->smc.clk = NULL;
} }
of_node_put(smc_np);
ret = clk_prepare_enable(ebi->smc.clk); ret = clk_prepare_enable(ebi->smc.clk);
if (ret) if (ret)
return ret; return ret;
@ -615,10 +610,6 @@ static int atmel_ebi_probe(struct platform_device *pdev)
} }
return of_platform_populate(np, NULL, NULL, dev); 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) static __maybe_unused int atmel_ebi_resume(struct device *dev)