diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2015-11-05 09:41:12 +0200 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2016-03-03 17:38:23 +0200 |
| commit | 98df844806869d09d9fb06ec69411f0378373360 (patch) | |
| tree | 335a8190aefdb5cbda95662b414b31759e93d102 /drivers/gpu/drm/omapdrm | |
| parent | 3421899893d9c430635b909e1ba0287ba6319e34 (diff) | |
| download | talos-op-linux-98df844806869d09d9fb06ec69411f0378373360.tar.gz talos-op-linux-98df844806869d09d9fb06ec69411f0378373360.zip | |
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>
Diffstat (limited to 'drivers/gpu/drm/omapdrm')
| -rw-r--r-- | drivers/gpu/drm/omapdrm/dss/dpi.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/omapdrm/dss/sdi.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/omapdrm/dss/dpi.c b/drivers/gpu/drm/omapdrm/dss/dpi.c index cd6254bee656..d4be2444b2ea 100644 --- 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 e00aaabb77b8..0526f24ed8a9 100644 --- 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) |
