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 fb45b64..7953e6a 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 b3606de..59065e1 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 94c8d55..7103c65 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 b59ba79..a955a2c 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 1525a49..aea6a1d 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 5843580..d747cc6 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 99ca268..c9260a4 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;