提交 0de9f23a 编写于 作者: W Wei Yongjun 提交者: Mike Turquette

clk: fix return value check in bcm2835_init_clocks()

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

dpatch engine is used to auto generate this patch.
(https://github.com/weiyj/dpatch)
Signed-off-by: NWei Yongjun <yongjun_wei@trendmicro.com.cn>
Acked-by: NStephen Warren <swarren@wwwdotorg.org>
Signed-off-by: NMike Turquette <mturquette@linaro.org>
上级 78e30d12
...@@ -33,17 +33,17 @@ void __init bcm2835_init_clocks(void) ...@@ -33,17 +33,17 @@ void __init bcm2835_init_clocks(void)
clk = clk_register_fixed_rate(NULL, "sys_pclk", NULL, CLK_IS_ROOT, clk = clk_register_fixed_rate(NULL, "sys_pclk", NULL, CLK_IS_ROOT,
250000000); 250000000);
if (!clk) if (IS_ERR(clk))
pr_err("sys_pclk not registered\n"); pr_err("sys_pclk not registered\n");
clk = clk_register_fixed_rate(NULL, "apb_pclk", NULL, CLK_IS_ROOT, clk = clk_register_fixed_rate(NULL, "apb_pclk", NULL, CLK_IS_ROOT,
126000000); 126000000);
if (!clk) if (IS_ERR(clk))
pr_err("apb_pclk not registered\n"); pr_err("apb_pclk not registered\n");
clk = clk_register_fixed_rate(NULL, "uart0_pclk", NULL, CLK_IS_ROOT, clk = clk_register_fixed_rate(NULL, "uart0_pclk", NULL, CLK_IS_ROOT,
3000000); 3000000);
if (!clk) if (IS_ERR(clk))
pr_err("uart0_pclk not registered\n"); pr_err("uart0_pclk not registered\n");
ret = clk_register_clkdev(clk, NULL, "20201000.uart"); ret = clk_register_clkdev(clk, NULL, "20201000.uart");
if (ret) if (ret)
...@@ -51,7 +51,7 @@ void __init bcm2835_init_clocks(void) ...@@ -51,7 +51,7 @@ void __init bcm2835_init_clocks(void)
clk = clk_register_fixed_rate(NULL, "uart1_pclk", NULL, CLK_IS_ROOT, clk = clk_register_fixed_rate(NULL, "uart1_pclk", NULL, CLK_IS_ROOT,
125000000); 125000000);
if (!clk) if (IS_ERR(clk))
pr_err("uart1_pclk not registered\n"); pr_err("uart1_pclk not registered\n");
ret = clk_register_clkdev(clk, NULL, "20215000.uart"); ret = clk_register_clkdev(clk, NULL, "20215000.uart");
if (ret) if (ret)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册