OMAPDSS: DISPC: clean up dispc_mgr_timings_ok

dispc_mgr_timings_ok() is a bit confusing how it handles the return
value.

Change the function to just return immediately when a timing is deemed
not valid, making the code much easier to follow.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

diff --git a/drivers/video/fbdev/omap2/dss/dispc.c b/drivers/video/fbdev/omap2/dss/dispc.c
index 37373b61784ec113055eec1b1f223726c334b1cf..be053aa80880d0bb1cfcc8f3fb6d908e9f7be80d 100644 (file)
--- a/drivers/video/fbdev/omap2/dss/dispc.c
+++ b/drivers/video/fbdev/omap2/dss/dispc.c
@@ -2879,22 +2879,24 @@ static bool _dispc_mgr_pclk_ok(enum omap_channel channel,
 bool dispc_mgr_timings_ok(enum omap_channel channel,
                const struct omap_video_timings *timings)
 {
-       bool timings_ok;
-
-       timings_ok = _dispc_mgr_size_ok(timings->x_res, timings->y_res);
+       if (!_dispc_mgr_size_ok(timings->x_res, timings->y_res))
+               return false;
 
-       timings_ok &= _dispc_mgr_pclk_ok(channel, timings->pixelclock);
+       if (!_dispc_mgr_pclk_ok(channel, timings->pixelclock))
+               return false;
 
        if (dss_mgr_is_lcd(channel)) {
                /* TODO: OMAP4+ supports interlace for LCD outputs */
-               timings_ok &= timings->interlace == false;
+               if (timings->interlace)
+                       return false;
 
-               timings_ok &= _dispc_lcd_timings_ok(timings->hsw, timings->hfp,
+               if (!_dispc_lcd_timings_ok(timings->hsw, timings->hfp,
                                timings->hbp, timings->vsw, timings->vfp,
-                               timings->vbp);
+                               timings->vbp))
+                       return false;
        }
 
-       return timings_ok;
+       return true;
 }
 
 static void _dispc_mgr_set_lcd_timings(enum omap_channel channel, int hsw,