[PATCH v1 04/16] drm/imx: fix opencoded use of drm_panel_*

[Sam Ravnborg]

Use the drm_panel_get_modes() function to get the modes.

This patch leave one test for the function pointer:
    panel->funcs->get_modes

This is used to check if the panel may have any modes.
There is no direct replacement.
We may be able to just check that drm_panel_get_modes() return > 0,
but as this is not the same functionality it is left for later.

Signed-off-by: Sam Ravnborg <s...@ravnborg.org>
Cc: Philipp Zabel <p.za...@pengutronix.de>
Cc: Shawn Guo <shawn...@kernel.org>
Cc: Sascha Hauer <s.ha...@pengutronix.de>
Cc: Pengutronix Kernel Team <ker...@pengutronix.de>
Cc: Fabio Estevam <feste...@gmail.com>
Cc: NXP Linux Team <linux-...@nxp.com>
Cc: linux-arm-ker...@lists.infradead.org
---
 drivers/gpu/drm/imx/imx-ldb.c          | 11 ++++-------
 drivers/gpu/drm/imx/parallel-display.c | 11 ++++-------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/drivers/gpu/drm/imx/imx-ldb.c b/drivers/gpu/drm/imx/imx-ldb.c
index db461b6a257f..695f307f36b2 100644
--- a/drivers/gpu/drm/imx/imx-ldb.c
+++ b/drivers/gpu/drm/imx/imx-ldb.c
@@ -124,14 +124,11 @@ static void imx_ldb_ch_set_bus_format(struct 
imx_ldb_channel *imx_ldb_ch,
 static int imx_ldb_connector_get_modes(struct drm_connector *connector)
 {
        struct imx_ldb_channel *imx_ldb_ch = con_to_imx_ldb_ch(connector);
-       int num_modes = 0;
+       int num_modes;
 
-       if (imx_ldb_ch->panel && imx_ldb_ch->panel->funcs &&
-           imx_ldb_ch->panel->funcs->get_modes) {
-               num_modes = 
imx_ldb_ch->panel->funcs->get_modes(imx_ldb_ch->panel);
-               if (num_modes > 0)
-                       return num_modes;
-       }
+       num_modes = drm_panel_get_modes(imx_ldb_ch->panel);
+       if (num_modes > 0)
+               return num_modes;
 
        if (!imx_ldb_ch->edid && imx_ldb_ch->ddc)
                imx_ldb_ch->edid = drm_get_edid(connector, imx_ldb_ch->ddc);
diff --git a/drivers/gpu/drm/imx/parallel-display.c 
b/drivers/gpu/drm/imx/parallel-display.c
index 2e51b2fade75..e7ce17503ae1 100644
--- a/drivers/gpu/drm/imx/parallel-display.c
+++ b/drivers/gpu/drm/imx/parallel-display.c
@@ -47,14 +47,11 @@ static int imx_pd_connector_get_modes(struct drm_connector 
*connector)
 {
        struct imx_parallel_display *imxpd = con_to_imxpd(connector);
        struct device_node *np = imxpd->dev->of_node;
-       int num_modes = 0;
+       int num_modes;
 
-       if (imxpd->panel && imxpd->panel->funcs &&
-           imxpd->panel->funcs->get_modes) {
-               num_modes = imxpd->panel->funcs->get_modes(imxpd->panel);
-               if (num_modes > 0)
-                       return num_modes;
-       }
+       num_modes = drm_panel_get_modes(imxpd->panel);
+       if (num_modes > 0)
+               return num_modes;
 
        if (imxpd->edid) {
                drm_connector_update_edid_property(connector, imxpd->edid);
-- 
2.20.1

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel