| Message ID | 20221128083755.80445-1-zhengyongjun3@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2] soc: imx8m: Fix return value check in imx8mq_soc_revision() | expand |
Hello Zheng, On 28.11.22 09:37, Zheng Yongjun wrote: > In case of error, the function of_clk_get_by_name() > returns ERR_PTR() and never returns NULL. The NULL test in the > return value check should be replaced with IS_ERR(). > > Fixes: 836fb30949d9 ("soc: imx8m: Enable OCOTP clock before reading the register") > Signed-off-by: Zheng Yongjun <zhengyongjun3@huawei.com> Reviewed-by: Ahmad Fatoum <a.fatoum@pengutronix.de> Maintainers will usually collect tags replied to the current patch revision when they apply a series. However, If you send a new revision, please make sure to incorporate any tags yourself. Cheers, Ahmad > --- > Changes in v2: > - Rewrite code and make it more concise. > drivers/soc/imx/soc-imx8m.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/drivers/soc/imx/soc-imx8m.c b/drivers/soc/imx/soc-imx8m.c > index 28144c699b0c..d1dbe318be53 100644 > --- a/drivers/soc/imx/soc-imx8m.c > +++ b/drivers/soc/imx/soc-imx8m.c > @@ -66,10 +66,8 @@ static u32 __init imx8mq_soc_revision(void) > ocotp_base = of_iomap(np, 0); > WARN_ON(!ocotp_base); > clk = of_clk_get_by_name(np, NULL); > - if (!clk) { > - WARN_ON(!clk); > + if (WARN_ON(IS_ERR(clk))) > return 0; > - } > > clk_prepare_enable(clk); > > -- > 2.17.1 > > >
diff --git a/drivers/soc/imx/soc-imx8m.c b/drivers/soc/imx/soc-imx8m.c index 28144c699b0c..d1dbe318be53 100644 --- a/drivers/soc/imx/soc-imx8m.c +++ b/drivers/soc/imx/soc-imx8m.c @@ -66,10 +66,8 @@ static u32 __init imx8mq_soc_revision(void) ocotp_base = of_iomap(np, 0); WARN_ON(!ocotp_base); clk = of_clk_get_by_name(np, NULL); - if (!clk) { - WARN_ON(!clk); + if (WARN_ON(IS_ERR(clk))) return 0; - } clk_prepare_enable(clk);
In case of error, the function of_clk_get_by_name() returns ERR_PTR() and never returns NULL. The NULL test in the return value check should be replaced with IS_ERR(). Fixes: 836fb30949d9 ("soc: imx8m: Enable OCOTP clock before reading the register") Signed-off-by: Zheng Yongjun <zhengyongjun3@huawei.com> --- Changes in v2: - Rewrite code and make it more concise. drivers/soc/imx/soc-imx8m.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -- 2.17.1