5 files changed, 11 insertions, 11 deletions

diff --git a/drivers/gpu/drm/omapdrm/omap_encoder.c b/drivers/gpu/drm/omapdrm/omap_encoder.c
index c29451ba65da..6a12e899235b 100644
--- a/drivers/gpu/drm/omapdrm/omap_encoder.c
+++ b/drivers/gpu/drm/omapdrm/omap_encoder.c
@@ -133,7 +133,7 @@ int omap_encoder_update(struct drm_encoder *encoder,
         struct omap_dss_driver *dssdrv = dssdev->driver;
         int ret;
 
-        dssdev->output->manager = mgr;
+        dssdev->src->manager = mgr;
 
         if (dssdrv->check_timings) {
                 ret = dssdrv->check_timings(dssdev, timings);
diff --git a/drivers/video/omap2/displays-new/encoder-tfp410.c b/drivers/video/omap2/displays-new/encoder-tfp410.c
index a04f65856d6b..454f7714d87a 100644
--- a/drivers/video/omap2/displays-new/encoder-tfp410.c
+++ b/drivers/video/omap2/displays-new/encoder-tfp410.c
@@ -43,7 +43,7 @@ static int tfp410_connect(struct omap_dss_device *dssdev,
         if (r)
                 return r;
 
-        dst->output = dssdev;
+        dst->src = dssdev;
         dssdev->device = dst;
 
         return 0;
@@ -63,7 +63,7 @@ static void tfp410_disconnect(struct omap_dss_device *dssdev,
         if (dst != dssdev->device)
                 return;
 
-        dst->output = NULL;
+        dst->src = NULL;
         dssdev->device = NULL;
 
         in->ops.dpi->disconnect(in, &ddata->dssdev);
diff --git a/drivers/video/omap2/displays-new/encoder-tpd12s015.c b/drivers/video/omap2/displays-new/encoder-tpd12s015.c
index ce0e010026cb..a3d29914d3b6 100644
--- a/drivers/video/omap2/displays-new/encoder-tpd12s015.c
+++ b/drivers/video/omap2/displays-new/encoder-tpd12s015.c
@@ -66,7 +66,7 @@ static int tpd_connect(struct omap_dss_device *dssdev,
         if (r)
                 return r;
 
-        dst->output = dssdev;
+        dst->src = dssdev;
         dssdev->device = dst;
 
         INIT_COMPLETION(ddata->hpd_completion);
@@ -102,7 +102,7 @@ static void tpd_disconnect(struct omap_dss_device *dssdev,
 
         gpio_set_value_cansleep(ddata->ct_cp_hpd_gpio, 0);
 
-        dst->output = NULL;
+        dst->src = NULL;
         dssdev->device = NULL;
 
         in->ops.hdmi->disconnect(in, &ddata->dssdev);
diff --git a/drivers/video/omap2/dss/output.c b/drivers/video/omap2/dss/output.c
index 3f5c0a758b32..15f47af8e048 100644
--- a/drivers/video/omap2/dss/output.c
+++ b/drivers/video/omap2/dss/output.c
@@ -48,7 +48,7 @@ int omapdss_output_set_device(struct omap_dss_device *out,
         }
 
         out->device = dssdev;
-        dssdev->output = out;
+        dssdev->src = out;
 
         mutex_unlock(&output_lock);
 
@@ -79,7 +79,7 @@ int omapdss_output_unset_device(struct omap_dss_device *out)
                 goto err;
         }
 
-        out->device->output = NULL;
+        out->device->src = NULL;
         out->device = NULL;
 
         mutex_unlock(&output_lock);
@@ -146,8 +146,8 @@ EXPORT_SYMBOL(omap_dss_find_output_by_node);
 
 struct omap_dss_device *omapdss_find_output_from_display(struct omap_dss_device *dssdev)
 {
-        while (dssdev->output)
-                dssdev = dssdev->output;
+        while (dssdev->src)
+                dssdev = dssdev->src;
 
         if (dssdev->id != 0)
                 return omap_dss_get_device(dssdev);
diff --git a/include/video/omapdss.h b/include/video/omapdss.h
index 763b11b58153..5fa81ddb43ad 100644
--- a/include/video/omapdss.h
+++ b/include/video/omapdss.h
@@ -774,7 +774,7 @@ struct omap_dss_device {
 
         enum omap_display_caps caps;
 
-        struct omap_dss_device *output;
+        struct omap_dss_device *src;
 
         enum omap_dss_display_state state;
 
@@ -1011,7 +1011,7 @@ void dss_mgr_unregister_framedone_handler(struct omap_overlay_manager *mgr,
 
 static inline bool omapdss_device_is_connected(struct omap_dss_device *dssdev)
 {
-        return dssdev->output;
+        return dssdev->src;
 }
 
 static inline bool omapdss_device_is_enabled(struct omap_dss_device *dssdev)