diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-10-19 15:06:07 +0300 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-11-27 12:27:02 +0200 |
| commit | 3c91ee8cc9fa785ed9c4ad250d3f293f279153fe (patch) | |
| tree | e2d0da999ea1a09c6f251936ab31db3e24b79363 /drivers/video/omap2 | |
| parent | 916188a46618313eedb07acac00fa575c503ff25 (diff) | |
| download | linux-3.10-3c91ee8cc9fa785ed9c4ad250d3f293f279153fe.tar.gz linux-3.10-3c91ee8cc9fa785ed9c4ad250d3f293f279153fe.tar.bz2 linux-3.10-3c91ee8cc9fa785ed9c4ad250d3f293f279153fe.zip | |
OMAPDSS: DISPC: use WARN_ON() in dispc_mgr_go
dispc_mgr_go() should never be called with manager output disabled or if
the GO bit is already set. Change the current silent returns to
WARN_ONs.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video/omap2')
| -rw-r--r-- | drivers/video/omap2/dss/dispc.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c index 942dd16f317..531961424d3 100644 --- a/drivers/video/omap2/dss/dispc.c +++ b/drivers/video/omap2/dss/dispc.c @@ -569,20 +569,8 @@ bool dispc_mgr_go_busy(enum omap_channel channel) void dispc_mgr_go(enum omap_channel channel) { - bool enable_bit, go_bit; - - /* if the channel is not enabled, we don't need GO */ - enable_bit = mgr_fld_read(channel, DISPC_MGR_FLD_ENABLE) == 1; - - if (!enable_bit) - return; - - go_bit = mgr_fld_read(channel, DISPC_MGR_FLD_GO) == 1; - - if (go_bit) { - DSSERR("GO bit not down for channel %d\n", channel); - return; - } + WARN_ON(dispc_mgr_is_enabled(channel) == false); + WARN_ON(dispc_mgr_go_busy(channel)); DSSDBG("GO %s\n", mgr_desc[channel].name); |