2012-10-07 14:02:48

by Wei Yongjun

Subject: [PATCH] clk: fix return value check in bcm2835_init_clocks()

From: Wei Yongjun <[email protected]>

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: Wei Yongjun <[email protected]>
---
drivers/clk/clk-bcm2835.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/clk/clk-bcm2835.c b/drivers/clk/clk-bcm2835.c
index 67ad16b..b61ee2c 100644
--- a/drivers/clk/clk-bcm2835.c
+++ b/drivers/clk/clk-bcm2835.c
@@ -33,17 +33,17 @@ void __init bcm2835_init_clocks(void)

clk = clk_register_fixed_rate(NULL, "sys_pclk", NULL, CLK_IS_ROOT,
250000000);
- if (!clk)
+ if (IS_ERR(clk))
pr_err("sys_pclk not registered\n");

clk = clk_register_fixed_rate(NULL, "apb_pclk", NULL, CLK_IS_ROOT,
126000000);
- if (!clk)
+ if (IS_ERR(clk))
pr_err("apb_pclk not registered\n");

clk = clk_register_fixed_rate(NULL, "uart0_pclk", NULL, CLK_IS_ROOT,
3000000);
- if (!clk)
+ if (IS_ERR(clk))
pr_err("uart0_pclk not registered\n");
ret = clk_register_clkdev(clk, NULL, "20201000.uart");
if (ret)
@@ -51,7 +51,7 @@ void __init bcm2835_init_clocks(void)

clk = clk_register_fixed_rate(NULL, "uart1_pclk", NULL, CLK_IS_ROOT,
125000000);
- if (!clk)
+ if (IS_ERR(clk))
pr_err("uart1_pclk not registered\n");
ret = clk_register_clkdev(clk, NULL, "20215000.uart");
if (ret)

2012-10-09 02:31:23

by Stephen Warren

Subject: Re: [PATCH] clk: fix return value check in bcm2835_init_clocks()

On 10/07/2012 08:02 AM, Wei Yongjun wrote:
> From: Wei Yongjun <[email protected]>
>
> 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)

Acked-by: Stephen Warren <[email protected]>

Mike, this driver was added through arm-soc; I assume it's simplest to
take this fixup through there too for 3.7-rc*? If so, Wei, could you
resend this patch with my ack to [email protected]? Thanks.

2012-10-09 02:44:51

by Wei Yongjun

Subject: Re: [PATCH] clk: fix return value check in bcm2835_init_clocks()

On 10/09/2012 10:31 AM, Stephen Warren wrote:
> On 10/07/2012 08:02 AM, Wei Yongjun wrote:
>> From: Wei Yongjun <[email protected]>
>>
>> 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)
> Acked-by: Stephen Warren <[email protected]>
>
> Mike, this driver was added through arm-soc; I assume it's simplest to
> take this fixup through there too for 3.7-rc*? If so, Wei, could you
> resend this patch with my ack to [email protected]? Thanks.

Will do, thanks.

2012-10-11 01:37:04

by Mike Turquette

Subject: Re: [PATCH] clk: fix return value check in bcm2835_init_clocks()

Quoting Wei Yongjun (2012-10-08 19:44:47)
> On 10/09/2012 10:31 AM, Stephen Warren wrote:
> > On 10/07/2012 08:02 AM, Wei Yongjun wrote:
> >> From: Wei Yongjun <[email protected]>
> >>
> >> 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)
> > Acked-by: Stephen Warren <[email protected]>
> >
> > Mike, this driver was added through arm-soc; I assume it's simplest to
> > take this fixup through there too for 3.7-rc*? If so, Wei, could you
> > resend this patch with my ack to [email protected]? Thanks.
>
> Will do, thanks.

Works for me.

Mike