drm: omapdrm: dpi: Remove unneeded regulator check

The dpi_display_enable() function ensures that a VDDS_DSI regulator is
available if the DSI uses the VDDS_DSI supply. This is not needed, as a
failure to get the VDDS_DSI supply will result in a probe failure,
dpi_display_enable() will thus never be called in that case.

Remove the check, and replace tests for the FEAT_DPI_USES_VDDS_DSI
feature with a test for the regulator object.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

diff --git a/drivers/gpu/drm/omapdrm/dss/dpi.c b/drivers/gpu/drm/omapdrm/dss/dpi.c
index 86dbb65a6c28d6155c7944a6222a15e4634c12c7..2828b1c1f625c50dfc65174aeb517cf72573c3f1 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/dpi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dpi.c
@@ -403,19 +403,13 @@ static int dpi_display_enable(struct omap_dss_device *dssdev)
 
        mutex_lock(&dpi->lock);
 
-       if (dss_has_feature(FEAT_DPI_USES_VDDS_DSI) && !dpi->vdds_dsi_reg) {
-               DSSERR("no VDSS_DSI regulator\n");
-               r = -ENODEV;
-               goto err_no_reg;
-       }
-
        if (!out->dispc_channel_connected) {
                DSSERR("failed to enable display: no output/manager\n");
                r = -ENODEV;
                goto err_no_out_mgr;
        }
 
-       if (dss_has_feature(FEAT_DPI_USES_VDDS_DSI)) {
+       if (dpi->vdds_dsi_reg) {
                r = regulator_enable(dpi->vdds_dsi_reg);
                if (r)
                        goto err_reg_enable;
@@ -459,11 +453,10 @@ err_pll_init:
 err_src_sel:
        dispc_runtime_put();
 err_get_dispc:
-       if (dss_has_feature(FEAT_DPI_USES_VDDS_DSI))
+       if (dpi->vdds_dsi_reg)
                regulator_disable(dpi->vdds_dsi_reg);
 err_reg_enable:
 err_no_out_mgr:
-err_no_reg:
        mutex_unlock(&dpi->lock);
        return r;
 }
@@ -484,7 +477,7 @@ static void dpi_display_disable(struct omap_dss_device *dssdev)
 
        dispc_runtime_put();
 
-       if (dss_has_feature(FEAT_DPI_USES_VDDS_DSI))
+       if (dpi->vdds_dsi_reg)
                regulator_disable(dpi->vdds_dsi_reg);
 
        mutex_unlock(&dpi->lock);