Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9560dc10 authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

OMAPDSS: rename omap_dss_device's 'device' field to 'dst' 



In the old panel device model we had omap_dss_output entities,
representing the encoders in the DSS block. This entity had "device"
field, which pointed to the panel that was using the omap_dss_output.

With the new panel device model, the omap_dss_output is integrated into
omap_dss_device, which now represents a "display entity". Thus the "device"
field, now in omap_dss_device, points to the next entity in the display
entity-chain.

This patch renames the "device" field to "dst", which much better tells
what the field points to.

Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: default avatarArchit Taneja <archit@ti.com>
parent a73fdc64

drivers/video/omap2/displays-new/encoder-tfp410.c

+5 −5
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ static int tfp410_connect(struct omap_dss_device *dssdev, 
		return r;



	dst->src = dssdev;

	dssdev->device = dst;

	dssdev->dst = dst;



	return 0;

}
@@ -59,12 +59,12 @@ static void tfp410_disconnect(struct omap_dss_device *dssdev, 
	if (!omapdss_device_is_connected(dssdev))

		return;



	WARN_ON(dst != dssdev->device);

	if (dst != dssdev->device)

	WARN_ON(dst != dssdev->dst);

	if (dst != dssdev->dst)

		return;



	dst->src = NULL;

	dssdev->device = NULL;

	dssdev->dst = NULL;



	in->ops.dpi->disconnect(in, &ddata->dssdev);

}
@@ -244,7 +244,7 @@ static int __exit tfp410_remove(struct platform_device *pdev) 


	WARN_ON(omapdss_device_is_connected(dssdev));

	if (omapdss_device_is_connected(dssdev))

		tfp410_disconnect(dssdev, dssdev->device);

		tfp410_disconnect(dssdev, dssdev->dst);



	omap_dss_put_device(in);

drivers/video/omap2/displays-new/encoder-tpd12s015.c

+5 −5
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ static int tpd_connect(struct omap_dss_device *dssdev, 
		return r;



	dst->src = dssdev;

	dssdev->device = dst;

	dssdev->dst = dst;



	INIT_COMPLETION(ddata->hpd_completion);
@@ -95,15 +95,15 @@ static void tpd_disconnect(struct omap_dss_device *dssdev, 
	struct panel_drv_data *ddata = to_panel_data(dssdev);

	struct omap_dss_device *in = ddata->in;



	WARN_ON(dst != dssdev->device);

	WARN_ON(dst != dssdev->dst);



	if (dst != dssdev->device)

	if (dst != dssdev->dst)

		return;



	gpio_set_value_cansleep(ddata->ct_cp_hpd_gpio, 0);



	dst->src = NULL;

	dssdev->device = NULL;

	dssdev->dst = NULL;



	in->ops.hdmi->disconnect(in, &ddata->dssdev);

}
@@ -372,7 +372,7 @@ static int __exit tpd_remove(struct platform_device *pdev) 


	WARN_ON(omapdss_device_is_connected(dssdev));

	if (omapdss_device_is_connected(dssdev))

		tpd_disconnect(dssdev, dssdev->device);

		tpd_disconnect(dssdev, dssdev->dst);



	omap_dss_put_device(in);

drivers/video/omap2/dss/apply.c

+2 −2
Original line number Diff line number Diff line
@@ -428,8 +428,8 @@ static struct omap_dss_device *dss_mgr_get_device(struct omap_overlay_manager *m 
	if (dssdev == NULL)

		return NULL;



	while (dssdev->device)

		dssdev = dssdev->device;

	while (dssdev->dst)

		dssdev = dssdev->dst;



	if (dssdev->driver)

		return dssdev;

drivers/video/omap2/dss/dpi.c

+2 −2
Original line number Diff line number Diff line
@@ -643,9 +643,9 @@ static int dpi_connect(struct omap_dss_device *dssdev, 
static void dpi_disconnect(struct omap_dss_device *dssdev,

		struct omap_dss_device *dst)

{

	WARN_ON(dst != dssdev->device);

	WARN_ON(dst != dssdev->dst);



	if (dst != dssdev->device)

	if (dst != dssdev->dst)

		return;



	omapdss_output_unset_device(dssdev);

drivers/video/omap2/dss/dsi.c

+2 −2
Original line number Diff line number Diff line
@@ -5264,9 +5264,9 @@ static int dsi_connect(struct omap_dss_device *dssdev, 
static void dsi_disconnect(struct omap_dss_device *dssdev,

		struct omap_dss_device *dst)

{

	WARN_ON(dst != dssdev->device);

	WARN_ON(dst != dssdev->dst);



	if (dst != dssdev->device)

	if (dst != dssdev->dst)

		return;



	omapdss_output_unset_device(dssdev);