diff options
author | Roger Quadros <roger.quadros@nokia.com> | 2010-03-17 13:35:20 +0100 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@nokia.com> | 2010-05-18 14:14:29 +0300 |
commit | b1d145b6d3c07cb9ccb6afb224c78a9d61f8cd17 (patch) | |
tree | 4e0b1172d90ac5d91db63f9d9548ef26dc54934f /drivers/video | |
parent | b4d78bf7a4663c8354ec9432eb9631b144a33ffa (diff) | |
download | op-kernel-dev-b1d145b6d3c07cb9ccb6afb224c78a9d61f8cd17.zip op-kernel-dev-b1d145b6d3c07cb9ccb6afb224c78a9d61f8cd17.tar.gz |
OMAP: DSS2: Remove redundant enable/disable calls from SDI
Panel enable/disable is now done via the panel driver, so we should not
call the panel driver again
Signed-off-by: Roger Quadros <roger.quadros@nokia.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/omap2/dss/sdi.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/video/omap2/dss/sdi.c b/drivers/video/omap2/dss/sdi.c index 12eb404..3de3c1e 100644 --- a/drivers/video/omap2/dss/sdi.c +++ b/drivers/video/omap2/dss/sdi.c @@ -115,17 +115,9 @@ int omapdss_sdi_display_enable(struct omap_dss_device *dssdev) dssdev->manager->enable(dssdev->manager); - if (dssdev->driver->enable) { - r = dssdev->driver->enable(dssdev); - if (r) - goto err3; - } - sdi.skip_init = 0; return 0; -err3: - dssdev->manager->disable(dssdev->manager); err2: dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK1); err1: @@ -137,9 +129,6 @@ EXPORT_SYMBOL(omapdss_sdi_display_enable); void omapdss_sdi_display_disable(struct omap_dss_device *dssdev) { - if (dssdev->driver->disable) - dssdev->driver->disable(dssdev); - dssdev->manager->disable(dssdev->manager); dss_sdi_disable(); |