Re: [PATCH next] drm/vc4: hdmi: Fix some NULL vs IS_ERR() bugs

[Anusha Srivatsa <asrivats@xxxxxxxxxx>]

Thanks for the fix. I shall revisit the rest of my series.

Reviewed-by: Anusha Srivatsa <asrivats@xxxxxxxxxx>

On Fri, Feb 28, 2025 at 4:38 AM Dan Carpenter <dan.carpenter@xxxxxxxxxx> wrote:

The devm_platform_ioremap_resource_byname() function doesn't return NULL,
it returns error pointers.  Update the checking to match.

Fixes: b93f07cf090a ("drm/vc4: move to devm_platform_ioremap_resource() usage")
Signed-off-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
---
 drivers/gpu/drm/vc4/vc4_hdmi.c | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
index d20e5c53ba75..37238a12baa5 100644
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
@@ -2928,8 +2928,8 @@ static int vc5_hdmi_init_resources(struct drm_device *drm,

        vc4_hdmi->hdmicore_regs = devm_platform_ioremap_resource_byname(pdev,
                                                                        "hdmi");
-       if (!vc4_hdmi->hdmicore_regs)
-               return -ENOMEM;
+       if (IS_ERR(vc4_hdmi->hdmicore_regs))
+               return PTR_ERR(vc4_hdmi->hdmicore_regs);

        /* This is shared between both HDMI controllers. Cannot
         * claim for both instances. Lets not convert to using
@@ -2946,33 +2946,33 @@ static int vc5_hdmi_init_resources(struct drm_device *drm,

        vc4_hdmi->cec_regs = devm_platform_ioremap_resource_byname(pdev,
                                                                   "cec");
-       if (!vc4_hdmi->cec_regs)
-               return -ENOMEM;
+       if (IS_ERR(vc4_hdmi->cec_regs))
+               return PTR_ERR(vc4_hdmi->cec_regs);

        vc4_hdmi->csc_regs = devm_platform_ioremap_resource_byname(pdev,
                                                                   "csc");
-       if (!vc4_hdmi->csc_regs)
-               return -ENOMEM;
+       if (IS_ERR(vc4_hdmi->csc_regs))
+               return PTR_ERR(vc4_hdmi->csc_regs);

        vc4_hdmi->dvp_regs = devm_platform_ioremap_resource_byname(pdev,
                                                                   "dvp");
-       if (!vc4_hdmi->dvp_regs)
-               return -ENOMEM;
+       if (IS_ERR(vc4_hdmi->dvp_regs))
+               return PTR_ERR(vc4_hdmi->dvp_regs);

        vc4_hdmi->phy_regs = devm_platform_ioremap_resource_byname(pdev,
                                                                   "phy");

-       if (!vc4_hdmi->phy_regs)
-               return -ENOMEM;
+       if (IS_ERR(vc4_hdmi->phy_regs))
+               return PTR_ERR(vc4_hdmi->phy_regs);

        vc4_hdmi->ram_regs = devm_platform_ioremap_resource_byname(pdev,
                                                                   "packet");
-       if (!vc4_hdmi->ram_regs)
-               return -ENOMEM;
+       if (IS_ERR(vc4_hdmi->ram_regs))
+               return PTR_ERR(vc4_hdmi->ram_regs);

        vc4_hdmi->rm_regs = devm_platform_ioremap_resource_byname(pdev, "rm");
-       if (!vc4_hdmi->rm_regs)
-               return -ENOMEM;
+       if (IS_ERR(vc4_hdmi->rm_regs))
+               return PTR_ERR(vc4_hdmi->rm_regs);

        vc4_hdmi->hsm_clock = devm_clk_get(dev, "hdmi");
        if (IS_ERR(vc4_hdmi->hsm_clock)) {
--
2.47.2