* [PATCH] drm/vc4: hdmi: Fix NULL vs IS_ERR() checks in vc5_hdmi_init_resources()
@ 2020-09-10 10:08 Dan Carpenter
2020-09-10 10:20 ` Maxime Ripard
0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2020-09-10 10:08 UTC (permalink / raw)
To: Eric Anholt
Cc: Dave Stevenson, David Airlie, kernel-janitors, dri-devel, Maxime Ripard
The devm_ioremap() function never returns error pointers, it returns
NULL.
Fixes: 8323989140f3 ("drm/vc4: hdmi: Support the BCM2711 HDMI controllers")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
drivers/gpu/drm/vc4/vc4_hdmi.c | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
index d0792915436c..03825596a308 100644
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
@@ -1545,64 +1545,64 @@ static int vc5_hdmi_init_resources(struct vc4_hdmi *vc4_hdmi)
vc4_hdmi->hdmicore_regs = devm_ioremap(dev, res->start,
resource_size(res));
- if (IS_ERR(vc4_hdmi->hdmicore_regs))
- return PTR_ERR(vc4_hdmi->hdmicore_regs);
+ if (!vc4_hdmi->hdmicore_regs)
+ return -ENOMEM;
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "hd");
if (!res)
return -ENODEV;
vc4_hdmi->hd_regs = devm_ioremap(dev, res->start, resource_size(res));
- if (IS_ERR(vc4_hdmi->hd_regs))
- return PTR_ERR(vc4_hdmi->hd_regs);
+ if (!vc4_hdmi->hd_regs)
+ return -ENOMEM;
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "cec");
if (!res)
return -ENODEV;
vc4_hdmi->cec_regs = devm_ioremap(dev, res->start, resource_size(res));
- if (IS_ERR(vc4_hdmi->cec_regs))
- return PTR_ERR(vc4_hdmi->cec_regs);
+ if (!vc4_hdmi->cec_regs)
+ return -ENOMEM;
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "csc");
if (!res)
return -ENODEV;
vc4_hdmi->csc_regs = devm_ioremap(dev, res->start, resource_size(res));
- if (IS_ERR(vc4_hdmi->csc_regs))
- return PTR_ERR(vc4_hdmi->csc_regs);
+ if (!vc4_hdmi->csc_regs)
+ return -ENOMEM;
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dvp");
if (!res)
return -ENODEV;
vc4_hdmi->dvp_regs = devm_ioremap(dev, res->start, resource_size(res));
- if (IS_ERR(vc4_hdmi->dvp_regs))
- return PTR_ERR(vc4_hdmi->dvp_regs);
+ if (!vc4_hdmi->dvp_regs)
+ return -ENOMEM;
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "phy");
if (!res)
return -ENODEV;
vc4_hdmi->phy_regs = devm_ioremap(dev, res->start, resource_size(res));
- if (IS_ERR(vc4_hdmi->phy_regs))
- return PTR_ERR(vc4_hdmi->phy_regs);
+ if (!vc4_hdmi->phy_regs)
+ return -ENOMEM;
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "packet");
if (!res)
return -ENODEV;
vc4_hdmi->ram_regs = devm_ioremap(dev, res->start, resource_size(res));
- if (IS_ERR(vc4_hdmi->ram_regs))
- return PTR_ERR(vc4_hdmi->ram_regs);
+ if (!vc4_hdmi->ram_regs)
+ return -ENOMEM;
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "rm");
if (!res)
return -ENODEV;
vc4_hdmi->rm_regs = devm_ioremap(dev, res->start, resource_size(res));
- if (IS_ERR(vc4_hdmi->rm_regs))
- return PTR_ERR(vc4_hdmi->rm_regs);
+ if (!vc4_hdmi->rm_regs)
+ return -ENOMEM;
vc4_hdmi->hsm_clock = devm_clk_get(dev, "hdmi");
if (IS_ERR(vc4_hdmi->hsm_clock)) {
--
2.28.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] drm/vc4: hdmi: Fix NULL vs IS_ERR() checks in vc5_hdmi_init_resources()
2020-09-10 10:08 [PATCH] drm/vc4: hdmi: Fix NULL vs IS_ERR() checks in vc5_hdmi_init_resources() Dan Carpenter
@ 2020-09-10 10:20 ` Maxime Ripard
0 siblings, 0 replies; 2+ messages in thread
From: Maxime Ripard @ 2020-09-10 10:20 UTC (permalink / raw)
To: Dan Carpenter
Cc: Dave Stevenson, David Airlie, kernel-janitors, dri-devel, Eric Anholt
[-- Attachment #1: Type: text/plain, Size: 315 bytes --]
On Thu, Sep 10, 2020 at 01:08:25PM +0300, Dan Carpenter wrote:
> The devm_ioremap() function never returns error pointers, it returns
> NULL.
>
> Fixes: 8323989140f3 ("drm/vc4: hdmi: Support the BCM2711 HDMI controllers")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Applied, thanks!
Maxime
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-09-10 10:20 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-10 10:08 [PATCH] drm/vc4: hdmi: Fix NULL vs IS_ERR() checks in vc5_hdmi_init_resources() Dan Carpenter
2020-09-10 10:20 ` Maxime Ripard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).