diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2013-07-24 13:01:34 +0300 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2013-08-30 08:51:10 +0300 |
| commit | a73fdc647417699833f22d0f239affe22e062827 (patch) | |
| tree | 604d506d15df8e16ff80b9682af42f1916eadb23 /drivers/video | |
| parent | b3864299c1602efabcdb87d0264a45845530b7c9 (diff) | |
OMAPDSS: rename omap_dss_device's 'output' to 'src'
In the old panel device model we had "outputs", which were the encoders
inside OMAP DSS block, and panel devices (omap_dss_device). The panel
devices had a reference to the source of the video data, i.e. reference
to an "output", in a field named "output".
That was somewhat confusing even in the old panel device model, but even
more so with the panel device model where we can have longer chains of
display entities.
This patch renames the "output" field to "src", which much better tells
what the field points to.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: Archit Taneja <archit@ti.com>
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/omap2/displays-new/encoder-tfp410.c | 4 | ||||
| -rw-r--r-- | drivers/video/omap2/displays-new/encoder-tpd12s015.c | 4 | ||||
| -rw-r--r-- | drivers/video/omap2/dss/output.c | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/drivers/video/omap2/displays-new/encoder-tfp410.c b/drivers/video/omap2/displays-new/encoder-tfp410.c index a04f65856d6..454f7714d87 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 ce0e010026c..a3d29914d3b 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 3f5c0a758b3..15f47af8e04 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); |