lkml.org 
[lkml]   [2018]   [May]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH v1 1/1] clk: npcm750: fix base address and of_clk_get_by_name error handling. Also update error messages to be more informative
Date

Nuvoton NPCM7XX Clock Controller
fix base address and of_clk_get_by_name error handling.
Also update error messages to be more informative.

In case clk_base allocation is erronoeous the return value is null.
Also fix handling of of_clk_get_by_name returns an error.
Print a better error message pointing to the dt-binding documention.


Signed-off-by: Tali Perry <tali.perry1@gmail.com>
Reviewed-by: Rob Herring <robh@kernel.org>
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>

Tali Perry (2):

---
drivers/clk/clk-npcm7xx.c | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/drivers/clk/clk-npcm7xx.c b/drivers/clk/clk-npcm7xx.c
index 7e4964b9e5c8..6ff97f79fcd7 100644
--- a/drivers/clk/clk-npcm7xx.c
+++ b/drivers/clk/clk-npcm7xx.c
@@ -583,7 +583,7 @@ static void __init npcm7xx_clk_init(struct device_node *clk_np)


clk_base = ioremap(res.start, resource_size(&res));
- if (IS_ERR(clk_base))
+ if (!clk_base)
goto npcm7xx_init_error;


@@ -604,24 +604,27 @@ static void __init npcm7xx_clk_init(struct device_node *clk_np)

/* Read fixed clocks. These 3 clocks must be defined in DT */
clk = of_clk_get_by_name(clk_np, NPCM7XX_CLK_S_REFCLK);
- if (!IS_ERR(clk)) {
- pr_err("failed to find external REFCLK: %ld\n",
+ if (IS_ERR(clk)) {
+ pr_err("failed to find external REFCLK on device tree, err=%ld\n",
PTR_ERR(clk));
clk_put(clk);
+ goto npcm7xx_init_fail_no_clk_on_dt;
}

clk = of_clk_get_by_name(clk_np, NPCM7XX_CLK_S_SYSBYPCK);
- if (!IS_ERR(clk)) {
- pr_err("failed to find external SYSBYPCK: %ld\n",
+ if (IS_ERR(clk)) {
+ pr_err("failed to find external SYSBYPCK on device tree, err=%ld\n",
PTR_ERR(clk));
clk_put(clk);
+ goto npcm7xx_init_fail_no_clk_on_dt;
}

clk = of_clk_get_by_name(clk_np, NPCM7XX_CLK_S_MCBYPCK);
- if (!IS_ERR(clk)) {
- pr_err("failed to find external MCBYPCK: %ld\n",
+ if (IS_ERR(clk)) {
+ pr_err("failed to find external MCBYPCK on device tree, err=%ld\n",
PTR_ERR(clk));
clk_put(clk);
+ goto npcm7xx_init_fail_no_clk_on_dt;
}

/* Register plls */
@@ -705,6 +708,9 @@ static void __init npcm7xx_clk_init(struct device_node *clk_np)

return;

+npcm7xx_init_fail_no_clk_on_dt:
+ pr_err("see Documentation/devicetree/bindings/clock/"
+ "nuvoton,npcm750-clk.txt for details\n");
npcm7xx_init_fail:
if (npcm7xx_clk_data->num)
kfree(npcm7xx_clk_data->hws);
--
2.14.1
\
 
 \ /
  Last update: 2018-05-01 10:15    [W:0.067 / U:1.076 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site