Merge tag 'v3.14' into drm-intel-next-queued

[deliverable/linux.git] / drivers / staging / imx-drm / imx-ldb.c

diff --git a/drivers/staging/imx-drm/imx-ldb.c b/drivers/staging/imx-drm/imx-ldb.c
index 654bf03e05ff8b34450674ce3142f5942b924420..c703e986b44c254e781f50a63cf6ac56501fc852 100644 (file)
--- a/drivers/staging/imx-drm/imx-ldb.c
+++ b/drivers/staging/imx-drm/imx-ldb.c
@@ -167,9 +167,8 @@ static void imx_ldb_set_clock(struct imx_ldb *ldb, int mux, int chno,
 
        /* set display clock mux to LDB input clock */
        ret = clk_set_parent(ldb->clk_sel[mux], ldb->clk[chno]);
-       if (ret) {
+       if (ret)
                dev_err(ldb->dev, "unable to set di%d parent clock to ldb_di%d\n", mux, chno);
-       }
 }
 
 static void imx_ldb_encoder_prepare(struct drm_encoder *encoder)
@@ -414,7 +413,7 @@ enum {
        LVDS_BIT_MAP_JEIDA
 };
 
-static const char *imx_ldb_bit_mappings[] = {
+static const char * const imx_ldb_bit_mappings[] = {
        [LVDS_BIT_MAP_SPWG]  = "spwg",
        [LVDS_BIT_MAP_JEIDA] = "jeida",
 };
@@ -596,8 +595,6 @@ static int imx_ldb_remove(struct platform_device *pdev)
                struct drm_connector *connector = &channel->connector;
                struct drm_encoder *encoder = &channel->encoder;
 
-               drm_mode_connector_detach_encoder(connector, encoder);
-
                imx_drm_remove_connector(channel->imx_drm_connector);
                imx_drm_remove_encoder(channel->imx_drm_encoder);
        }