OMAPDSS: remove extra out == NULL checks

All the output drivers check for 'out' being NULL, but it can never be
NULL. Remove the check.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

diff --git a/drivers/video/fbdev/omap2/dss/dpi.c b/drivers/video/fbdev/omap2/dss/dpi.c
index fb45b6432968e0ab73277497392729f5b5c3cdad..7953e6a523463080fc22569bd89dc3f7918c6dc4 100644 (file)
--- a/drivers/video/fbdev/omap2/dss/dpi.c
+++ b/drivers/video/fbdev/omap2/dss/dpi.c
@@ -395,7 +395,7 @@ static int dpi_display_enable(struct omap_dss_device *dssdev)
                goto err_no_reg;
        }
 
-       if (out == NULL || out->manager == NULL) {
+       if (out->manager == NULL) {
                DSSERR("failed to enable display: no output/manager\n");
                r = -ENODEV;
                goto err_no_out_mgr;

diff --git a/drivers/video/fbdev/omap2/dss/dsi.c b/drivers/video/fbdev/omap2/dss/dsi.c
index b3606def5b7ba7e853397ce223cedfb5d481027a..59065e18444d04098fcc37dab332555aa19ef72a 100644 (file)
--- a/drivers/video/fbdev/omap2/dss/dsi.c
+++ b/drivers/video/fbdev/omap2/dss/dsi.c
@@ -3833,7 +3833,7 @@ static int dsi_enable_video_output(struct omap_dss_device *dssdev, int channel)
        u16 word_count;
        int r;
 
-       if (out == NULL || out->manager == NULL) {
+       if (out->manager == NULL) {
                DSSERR("failed to enable display: no output/manager\n");
                return -ENODEV;
        }

diff --git a/drivers/video/fbdev/omap2/dss/hdmi4.c b/drivers/video/fbdev/omap2/dss/hdmi4.c
index 94c8d5549b4c356310afe206de0cbf64f303e495..7103c659a53488f48495dee43091200edb95f53b 100644 (file)
--- a/drivers/video/fbdev/omap2/dss/hdmi4.c
+++ b/drivers/video/fbdev/omap2/dss/hdmi4.c
@@ -343,7 +343,7 @@ static int hdmi_display_enable(struct omap_dss_device *dssdev)
 
        mutex_lock(&hdmi.lock);
 
-       if (out == NULL || out->manager == NULL) {
+       if (out->manager == NULL) {
                DSSERR("failed to enable display: no output/manager\n");
                r = -ENODEV;
                goto err0;

diff --git a/drivers/video/fbdev/omap2/dss/hdmi5.c b/drivers/video/fbdev/omap2/dss/hdmi5.c
index b59ba7902be1be112dcc1e954eaa1a03c58b374f..a955a2c4c061f4cd1c890f61f2ec749076eb66b9 100644 (file)
--- a/drivers/video/fbdev/omap2/dss/hdmi5.c
+++ b/drivers/video/fbdev/omap2/dss/hdmi5.c
@@ -373,7 +373,7 @@ static int hdmi_display_enable(struct omap_dss_device *dssdev)
 
        mutex_lock(&hdmi.lock);
 
-       if (out == NULL || out->manager == NULL) {
+       if (out->manager == NULL) {
                DSSERR("failed to enable display: no output/manager\n");
                r = -ENODEV;
                goto err0;

diff --git a/drivers/video/fbdev/omap2/dss/rfbi.c b/drivers/video/fbdev/omap2/dss/rfbi.c
index 1525a494d057a552ba86b900c43afbd253c0f883..aea6a1d0fb201e29ab7d18551a6dc595e3991dbd 100644 (file)
--- a/drivers/video/fbdev/omap2/dss/rfbi.c
+++ b/drivers/video/fbdev/omap2/dss/rfbi.c
@@ -880,7 +880,7 @@ static int rfbi_display_enable(struct omap_dss_device *dssdev)
        struct omap_dss_device *out = &rfbi.output;
        int r;
 
-       if (out == NULL || out->manager == NULL) {
+       if (out->manager == NULL) {
                DSSERR("failed to enable display: no output/manager\n");
                return -ENODEV;
        }

diff --git a/drivers/video/fbdev/omap2/dss/sdi.c b/drivers/video/fbdev/omap2/dss/sdi.c
index 5843580a1deb89c115c4a44939069776e8349f2f..d747cc6b59e14d87c167adeb9a526a9500ed460c 100644 (file)
--- a/drivers/video/fbdev/omap2/dss/sdi.c
+++ b/drivers/video/fbdev/omap2/dss/sdi.c
@@ -136,7 +136,7 @@ static int sdi_display_enable(struct omap_dss_device *dssdev)
        unsigned long pck;
        int r;
 
-       if (out == NULL || out->manager == NULL) {
+       if (out->manager == NULL) {
                DSSERR("failed to enable display: no output/manager\n");
                return -ENODEV;
        }

diff --git a/drivers/video/fbdev/omap2/dss/venc.c b/drivers/video/fbdev/omap2/dss/venc.c
index 99ca268c1cddf24332308b58fbeb051d565b8dca..c9260a451ca688b75620a33d06fedf42dddb6542 100644 (file)
--- a/drivers/video/fbdev/omap2/dss/venc.c
+++ b/drivers/video/fbdev/omap2/dss/venc.c
@@ -503,7 +503,7 @@ static int venc_display_enable(struct omap_dss_device *dssdev)
 
        mutex_lock(&venc.venc_lock);
 
-       if (out == NULL || out->manager == NULL) {
+       if (out->manager == NULL) {
                DSSERR("Failed to enable display: no output/manager\n");
                r = -ENODEV;
                goto err0;