| Message ID | 20200713032143.21362-1-vulab@iscas.ac.cn (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 12b90b40854a8461a02ef19f6f4474cc88d64b66 |
| Headers | show |
| Series | clk: clk-atlas6: fix return value check in atlas6_clk_init() | expand |
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 >
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
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");
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(-)