aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/omap2/dss/venc.c
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2012-02-17 10:58:04 -0500
committerTomi Valkeinen <tomi.valkeinen@ti.com>2012-05-11 07:44:51 -0400
commit852f083843af618eaa8997f7803c9aed8293fdf9 (patch)
tree45d823a928788f772e30a13ae8b2b9b4dfd109f7 /drivers/video/omap2/dss/venc.c
parenta57dd4fe7bef557afaa1a6cdb77cd95b2cba094e (diff)
OMAPDSS: remove uses of dss_runtime_get/put
Now that the omapdss_core device is the parent for all other dss devices, we don't need to use the dss_runtime_get/put anymore. Instead, enabling omapdss_core will happen automatically when a child device is enabled. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video/omap2/dss/venc.c')
-rw-r--r--drivers/video/omap2/dss/venc.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/video/omap2/dss/venc.c b/drivers/video/omap2/dss/venc.c
index 1884e347b630..90b57c5317bf 100644
--- a/drivers/video/omap2/dss/venc.c
+++ b/drivers/video/omap2/dss/venc.c
@@ -903,7 +903,6 @@ static int venc_runtime_suspend(struct device *dev)
903 clk_disable(venc.tv_dac_clk); 903 clk_disable(venc.tv_dac_clk);
904 904
905 dispc_runtime_put(); 905 dispc_runtime_put();
906 dss_runtime_put();
907 906
908 return 0; 907 return 0;
909} 908}
@@ -912,23 +911,14 @@ static int venc_runtime_resume(struct device *dev)
912{ 911{
913 int r; 912 int r;
914 913
915 r = dss_runtime_get();
916 if (r < 0)
917 goto err_get_dss;
918
919 r = dispc_runtime_get(); 914 r = dispc_runtime_get();
920 if (r < 0) 915 if (r < 0)
921 goto err_get_dispc; 916 return r;
922 917
923 if (venc.tv_dac_clk) 918 if (venc.tv_dac_clk)
924 clk_enable(venc.tv_dac_clk); 919 clk_enable(venc.tv_dac_clk);
925 920
926 return 0; 921 return 0;
927
928err_get_dispc:
929 dss_runtime_put();
930err_get_dss:
931 return r;
932} 922}
933 923
934static const struct dev_pm_ops venc_pm_ops = { 924static const struct dev_pm_ops venc_pm_ops = {