diff options
author | Roger Quadros <roger.quadros@nokia.com> | 2010-03-17 08:35:20 -0400 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@nokia.com> | 2010-05-18 07:14:29 -0400 |
commit | b1d145b6d3c07cb9ccb6afb224c78a9d61f8cd17 (patch) | |
tree | 4e0b1172d90ac5d91db63f9d9548ef26dc54934f /drivers/video/omap2 | |
parent | b4d78bf7a4663c8354ec9432eb9631b144a33ffa (diff) |
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/omap2')
-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 12eb4042dd82..3de3c1e559aa 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) | |||
115 | 115 | ||
116 | dssdev->manager->enable(dssdev->manager); | 116 | dssdev->manager->enable(dssdev->manager); |
117 | 117 | ||
118 | if (dssdev->driver->enable) { | ||
119 | r = dssdev->driver->enable(dssdev); | ||
120 | if (r) | ||
121 | goto err3; | ||
122 | } | ||
123 | |||
124 | sdi.skip_init = 0; | 118 | sdi.skip_init = 0; |
125 | 119 | ||
126 | return 0; | 120 | return 0; |
127 | err3: | ||
128 | dssdev->manager->disable(dssdev->manager); | ||
129 | err2: | 121 | err2: |
130 | dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK1); | 122 | dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK1); |
131 | err1: | 123 | err1: |
@@ -137,9 +129,6 @@ EXPORT_SYMBOL(omapdss_sdi_display_enable); | |||
137 | 129 | ||
138 | void omapdss_sdi_display_disable(struct omap_dss_device *dssdev) | 130 | void omapdss_sdi_display_disable(struct omap_dss_device *dssdev) |
139 | { | 131 | { |
140 | if (dssdev->driver->disable) | ||
141 | dssdev->driver->disable(dssdev); | ||
142 | |||
143 | dssdev->manager->disable(dssdev->manager); | 132 | dssdev->manager->disable(dssdev->manager); |
144 | 133 | ||
145 | dss_sdi_disable(); | 134 | dss_sdi_disable(); |