drm/imx: parallel-display: move panel/bridge detection to fail early

We do some string parsing and string comparison in front of
drm_of_find_panel_or_bridge(). All this work is useless if the call
fails. Move drm_of_find_panel_or_bridge() infront of the parsing work to
fail early.

Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>

diff --git a/drivers/gpu/drm/imx/parallel-display.c b/drivers/gpu/drm/imx/parallel-display.c
index 6e55bf9..a831b5b 100644 (file)
--- a/drivers/gpu/drm/imx/parallel-display.c
+++ b/drivers/gpu/drm/imx/parallel-display.c
@@ -320,6 +320,12 @@ static int imx_pd_bind(struct device *dev, struct device *master, void *data)
        imxpd = dev_get_drvdata(dev);
        memset(imxpd, 0, sizeof(*imxpd));
 
+       /* port@1 is the output port */
+       ret = drm_of_find_panel_or_bridge(np, 1, 0, &imxpd->panel,
+                                         &imxpd->next_bridge);
+       if (ret && ret != -ENODEV)
+               return ret;
+
        edidp = of_get_property(np, "edid", &imxpd->edid_len);
        if (edidp)
                imxpd->edid = kmemdup(edidp, imxpd->edid_len, GFP_KERNEL);
@@ -337,12 +343,6 @@ static int imx_pd_bind(struct device *dev, struct device *master, void *data)
        }
        imxpd->bus_format = bus_format;
 
-       /* port@1 is the output port */
-       ret = drm_of_find_panel_or_bridge(np, 1, 0, &imxpd->panel,
-                                         &imxpd->next_bridge);
-       if (ret && ret != -ENODEV)
-               return ret;
-
        imxpd->dev = dev;
 
        ret = imx_pd_register(drm, imxpd);