drm/omap: remove extra check in dpi and sdi

Both dpi and sdi check for 'mgr != NULL' in check_timings. This check is
not necessary, as mgr must always be set before check_timings. Remove
the check.

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

diff --git a/drivers/gpu/drm/omapdrm/dss/dpi.c b/drivers/gpu/drm/omapdrm/dss/dpi.c
index cd6254bee6567e8430596102f06ea816a4e73765..d4be2444b2eaa63d7eb5f452ca1c8e002428f487 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/dpi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dpi.c
@@ -516,7 +516,7 @@ static int dpi_check_timings(struct omap_dss_device *dssdev,
        if (timings->x_res % 8 != 0)
                return -EINVAL;
 
-       if (mgr && !dispc_mgr_timings_ok(mgr->id, timings))
+       if (!dispc_mgr_timings_ok(mgr->id, timings))
                return -EINVAL;
 
        if (timings->pixelclock == 0)

diff --git a/drivers/gpu/drm/omapdrm/dss/sdi.c b/drivers/gpu/drm/omapdrm/dss/sdi.c
index e00aaabb77b84ae2ac2fc0bfc10f1f9d3384ca6a..0526f24ed8a9a13c6f89eb350f2c9811ec9b7e07 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/sdi.c
+++ b/drivers/gpu/drm/omapdrm/dss/sdi.c
@@ -244,7 +244,7 @@ static int sdi_check_timings(struct omap_dss_device *dssdev,
 {
        struct omap_overlay_manager *mgr = sdi.output.manager;
 
-       if (mgr && !dispc_mgr_timings_ok(mgr->id, timings))
+       if (!dispc_mgr_timings_ok(mgr->id, timings))
                return -EINVAL;
 
        if (timings->pixelclock == 0)