drivers/soc/imx/soc-imx8m.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
of_clk_get_by_name() never returns NULL pointer, it will return
ERR_PTR() when it fails, so replace the check with IS_ERR().
Fixes: 836fb30949d9 ("soc: imx8m: Enable OCOTP clock before reading the register")
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
v1 -> v2:
Check WARN_ON() instead of checking IS_ERR().
---
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.25.1
Hi, thanks for the update. Am Mittwoch, 4. Januar 2023, 10:27:02 CET schrieb Yang Yingliang: > of_clk_get_by_name() never returns NULL pointer, it will return > ERR_PTR() when it fails, so replace the check with IS_ERR(). > > Fixes: 836fb30949d9 ("soc: imx8m: Enable OCOTP clock before reading the > register") Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> > --- > v1 -> v2: > Check WARN_ON() instead of checking IS_ERR(). > --- > 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); Reviewed-by: Alexander Stein <alexander.stein@ew.tq-group.com>
On 04.01.23 10:27, Yang Yingliang wrote: > of_clk_get_by_name() never returns NULL pointer, it will return > ERR_PTR() when it fails, so replace the check with IS_ERR(). > > Fixes: 836fb30949d9 ("soc: imx8m: Enable OCOTP clock before reading the register") > Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> Reviewed-by: Ahmad Fatoum <a.fatoum@pengutronix.de> > --- > v1 -> v2: > Check WARN_ON() instead of checking IS_ERR(). > --- > 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); > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
© 2016 - 2025 Red Hat, Inc.