OMAPDSS: remove omap_dss_start/stop_device()

[deliverable/linux.git] / drivers / video / omap2 / dss / venc.c

diff --git a/drivers/video/omap2/dss/venc.c b/drivers/video/omap2/dss/venc.c
index f6d2b3f9888596d12f57a0df9a96106e5a1cd862..d529a92494329a4616dca35de6ceaddb86588052 100644 (file)
--- a/drivers/video/omap2/dss/venc.c
+++ b/drivers/video/omap2/dss/venc.c
@@ -513,23 +513,15 @@ int omapdss_venc_display_enable(struct omap_dss_device *dssdev)
                goto err0;
        }
 
-       r = omap_dss_start_device(dssdev);
-       if (r) {
-               DSSERR("failed to start device\n");
-               goto err0;
-       }
-
        r = venc_power_on(dssdev);
        if (r)
-               goto err1;
+               goto err0;
 
        venc.wss_data = 0;
 
        mutex_unlock(&venc.venc_lock);
 
        return 0;
-err1:
-       omap_dss_stop_device(dssdev);
 err0:
        mutex_unlock(&venc.venc_lock);
        return r;
@@ -543,8 +535,6 @@ void omapdss_venc_display_disable(struct omap_dss_device *dssdev)
 
        venc_power_off(dssdev);
 
-       omap_dss_stop_device(dssdev);
-
        mutex_unlock(&venc.venc_lock);
 }