Revert "MLK-17750: drm/imx: ldb: Fix build on imx6/7"

This reverts commit 414fba94a0f0cbc0ca6c7f445908aa86288a178f.

diff --git a/drivers/gpu/drm/imx/imx-ldb.c b/drivers/gpu/drm/imx/imx-ldb.c
index b9c61b3..b61b322 100644 (file)
--- a/drivers/gpu/drm/imx/imx-ldb.c
+++ b/drivers/gpu/drm/imx/imx-ldb.c
@@ -294,10 +294,6 @@ static void imx_ldb_set_clock(struct imx_ldb *ldb, int mux, int chno,
                        chno);
 }
 
-#ifndef CONFIG_HAVE_IMX8_SOC
-static void dpu_pixel_link_validate(int dpu_id, int stream_id) {}
-static void dpu_pixel_link_invalidate(int dpu_id, int stream_id) {}
-#else
 /* FIXME: validate pixel link in a proper manner */
 static void dpu_pixel_link_validate(int dpu_id, int stream_id)
 {
@@ -386,7 +382,6 @@ static void dpu_pixel_link_invalidate(int dpu_id, int stream_id)
 
        sc_ipc_close(mu_id);
 }
-#endif
 
 static void imx_ldb_encoder_enable(struct drm_encoder *encoder)
 {
@@ -1018,9 +1013,6 @@ static int imx_ldb_panel_ddc(struct device *dev,
        return 0;
 }
 
-#ifndef CONFIG_HAVE_IMX8QM
-static void ldb_pixel_link_init(int id) {}
-#else
 static void ldb_pixel_link_init(int id)
 {
        sc_err_t sciErr;
@@ -1063,7 +1055,6 @@ static void ldb_pixel_link_init(int id)
 
        sc_ipc_close(mu_id);
 }
-#endif
 
 static int imx_ldb_bind(struct device *dev, struct device *master, void *data)
 {