clk: clk-atlas6: fix return value check in atlas6_clk_init()
diff mbox series

Message ID 20200713032143.21362-1-vulab@iscas.ac.cn
State New
Headers show
Series
  • clk: clk-atlas6: fix return value check in atlas6_clk_init()
Related show

Commit Message

Xu Wang July 13, 2020, 3:21 a.m. UTC
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 <vulab@iscas.ac.cn>
---
 drivers/clk/sirf/clk-atlas6.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Barry Song July 15, 2020, 9:23 a.m. UTC | #1
Xu Wang <vulab@iscas.ac.cn> 于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 <vulab@iscas.ac.cn>

Acked-by: Barry Song <baohua@kernel.org>

> ---
>  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
>
Stephen Boyd July 28, 2020, 1:22 a.m. UTC | #2
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 <vulab@iscas.ac.cn>
> ---

Applied to clk-next

Patch
diff mbox series

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");