2020-07-13 03:22:44

by Xu Wang

Subject: [PATCH] clk: clk-atlas6: fix return value check in atlas6_clk_init()

In case of error, the function clk_register() returns ERR_PTR()
and never returns NULL. The NULL test in the return value check
should be replaced with IS_ERR().

Signed-off-by: Xu Wang <[email protected]>
---
drivers/clk/sirf/clk-atlas6.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/clk/sirf/clk-atlas6.c b/drivers/clk/sirf/clk-atlas6.c
index c84d5bab7ac2..b95483bb6a5e 100644
--- a/drivers/clk/sirf/clk-atlas6.c
+++ b/drivers/clk/sirf/clk-atlas6.c
@@ -135,7 +135,7 @@ static void __init atlas6_clk_init(struct device_node *np)

for (i = pll1; i < maxclk; i++) {
atlas6_clks[i] = clk_register(NULL, atlas6_clk_hw_array[i]);
- BUG_ON(!atlas6_clks[i]);
+ BUG_ON(IS_ERR(atlas6_clks[i]));
}
clk_register_clkdev(atlas6_clks[cpu], NULL, "cpu");
clk_register_clkdev(atlas6_clks[io], NULL, "io");
--
2.17.1

2020-07-15 09:34:40

by Barry Song

Subject: Re: [PATCH] clk: clk-atlas6: fix return value check in atlas6_clk_init()

Xu Wang <[email protected]> 于2020年7月13日周一 下午3:27写道：
>
> In case of error, the function clk_register() returns ERR_PTR()
> and never returns NULL. The NULL test in the return value check
> should be replaced with IS_ERR().
>
> Signed-off-by: Xu Wang <[email protected]>

Acked-by: Barry Song <[email protected]>

> ---
> drivers/clk/sirf/clk-atlas6.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/clk/sirf/clk-atlas6.c b/drivers/clk/sirf/clk-atlas6.c
> index c84d5bab7ac2..b95483bb6a5e 100644
> --- a/drivers/clk/sirf/clk-atlas6.c
> +++ b/drivers/clk/sirf/clk-atlas6.c
> @@ -135,7 +135,7 @@ static void __init atlas6_clk_init(struct device_node *np)
>
> for (i = pll1; i < maxclk; i++) {
> atlas6_clks[i] = clk_register(NULL, atlas6_clk_hw_array[i]);
> - BUG_ON(!atlas6_clks[i]);
> + BUG_ON(IS_ERR(atlas6_clks[i]));
> }
> clk_register_clkdev(atlas6_clks[cpu], NULL, "cpu");
> clk_register_clkdev(atlas6_clks[io], NULL, "io");
> --
> 2.17.1
>

2020-07-28 01:23:07

by Stephen Boyd

Subject: Re: [PATCH] clk: clk-atlas6: fix return value check in atlas6_clk_init()

Quoting Xu Wang (2020-07-12 20:21:43)
> In case of error, the function clk_register() returns ERR_PTR()
> and never returns NULL. The NULL test in the return value check
> should be replaced with IS_ERR().
>
> Signed-off-by: Xu Wang <[email protected]>
> ---

Applied to clk-next