2020-09-21 03:48:15

by Xu Wang

Subject: [PATCH] clk: clk-prima2: fix return value check in prima2_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-prima2.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/clk/sirf/clk-prima2.c b/drivers/clk/sirf/clk-prima2.c
index 45dcbc9e0302..d17b345f4d2d 100644
--- a/drivers/clk/sirf/clk-prima2.c
+++ b/drivers/clk/sirf/clk-prima2.c
@@ -134,7 +134,7 @@ static void __init prima2_clk_init(struct device_node *np)

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

2020-09-26 02:54:40

by Barry Song

Subject: Re: [PATCH] clk: clk-prima2: fix return value check in prima2_clk_init()

Xu Wang <[email protected]> 于2020年9月21日周一 下午3:45写道：
>
> 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]>

Thanks

> ---
> drivers/clk/sirf/clk-prima2.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/clk/sirf/clk-prima2.c b/drivers/clk/sirf/clk-prima2.c
> index 45dcbc9e0302..d17b345f4d2d 100644
> --- a/drivers/clk/sirf/clk-prima2.c
> +++ b/drivers/clk/sirf/clk-prima2.c
> @@ -134,7 +134,7 @@ static void __init prima2_clk_init(struct device_node *np)
>
> for (i = pll1; i < maxclk; i++) {
> prima2_clks[i] = clk_register(NULL, prima2_clk_hw_array[i]);
> - BUG_ON(!prima2_clks[i]);
> + BUG_ON(IS_ERR(prima2_clks[i]));
> }
> clk_register_clkdev(prima2_clks[cpu], NULL, "cpu");
> clk_register_clkdev(prima2_clks[io], NULL, "io");
> --
> 2.17.1
>

2020-10-14 11:58:18

by Stephen Boyd

Subject: Re: [PATCH] clk: clk-prima2: fix return value check in prima2_clk_init()

Quoting Xu Wang (2020-09-20 20:45:22)
> 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