diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-02-17 16:58:04 +0100 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-05-11 13:44:51 +0200 |
| commit | 852f083843af618eaa8997f7803c9aed8293fdf9 (patch) | |
| tree | 45d823a928788f772e30a13ae8b2b9b4dfd109f7 /drivers/video/omap2/dss/dsi.c | |
| parent | OMAPDSS: create DPI & SDI drivers (diff) | |
| download | linux-852f083843af618eaa8997f7803c9aed8293fdf9.tar.xz linux-852f083843af618eaa8997f7803c9aed8293fdf9.zip | |
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/dsi.c')
| -rw-r--r-- | drivers/video/omap2/dss/dsi.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c index 43eeb0d04d47..9fdeb2131987 100644 --- a/drivers/video/omap2/dss/dsi.c +++ b/drivers/video/omap2/dss/dsi.c @@ -4767,7 +4767,6 @@ static int omap_dsihw_remove(struct platform_device *dsidev) static int dsi_runtime_suspend(struct device *dev) { dispc_runtime_put(); - dss_runtime_put(); return 0; } @@ -4776,20 +4775,11 @@ static int dsi_runtime_resume(struct device *dev) { int r; - r = dss_runtime_get(); - if (r) - goto err_get_dss; - r = dispc_runtime_get(); if (r) - goto err_get_dispc; + return r; return 0; - -err_get_dispc: - dss_runtime_put(); -err_get_dss: - return r; } static const struct dev_pm_ops dsi_pm_ops = { |