Commit 811860dd authored by Sebastian Reichel's avatar Sebastian Reichel Committed by Tomi Valkeinen
Browse files

drm/omap: drop unused DSS next pointer 



Since all encoders and panels are using the bridge API now,
we next pointer is no longer useful and can be dropped.

Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201215104657.802264-45-tomi.valkeinen@ti.com
parent 4a555518

drivers/gpu/drm/omapdrm/dss/base.c

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ struct omap_dss_device *omapdss_device_next_output(struct omap_dss_device *from) 
			goto done;

		}



		if (dssdev->id && (dssdev->next || dssdev->bridge))

		if (dssdev->id && dssdev->bridge)

			goto done;

	}

drivers/gpu/drm/omapdrm/dss/omapdss.h

+0 −1
Original line number Diff line number Diff line
@@ -296,7 +296,6 @@ struct omap_dss_device { 
	struct module *owner;



	struct dss_device *dss;

	struct omap_dss_device *next;

	struct drm_bridge *bridge;

	struct drm_bridge *next_bridge;

	struct drm_panel *panel;

drivers/gpu/drm/omapdrm/dss/output.c

+1 −12
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ int omapdss_device_init_output(struct omap_dss_device *out, 
		return 0;

	}



	out->next = omapdss_find_device_by_node(remote_node);

	out->bridge = of_drm_find_bridge(remote_node);

	out->panel = of_drm_find_panel(remote_node);

	if (IS_ERR(out->panel))
@@ -38,12 +37,6 @@ int omapdss_device_init_output(struct omap_dss_device *out, 


	of_node_put(remote_node);



	if (out->next && out->type != out->next->type) {

		dev_err(out->dev, "output type and display type don't match\n");

		ret = -EINVAL;

		goto error;

	}



	if (out->panel) {

		struct drm_bridge *bridge;
@@ -69,7 +62,7 @@ int omapdss_device_init_output(struct omap_dss_device *out, 
		out->bridge = local_bridge;

	}



	if (!out->next && !out->bridge) {

	if (!out->bridge) {

		ret = -EPROBE_DEFER;

		goto error;

	}
@@ -78,7 +71,6 @@ int omapdss_device_init_output(struct omap_dss_device *out, 


error:

	omapdss_device_cleanup_output(out);

	out->next = NULL;

	return ret;

}

EXPORT_SYMBOL(omapdss_device_init_output);
@@ -88,9 +80,6 @@ void omapdss_device_cleanup_output(struct omap_dss_device *out) 
	if (out->bridge && out->panel)

		drm_panel_bridge_remove(out->next_bridge ?

					out->next_bridge : out->bridge);



	if (out->next)

		omapdss_device_put(out->next);

}

EXPORT_SYMBOL(omapdss_device_cleanup_output);

drivers/gpu/drm/omapdrm/omap_encoder.c

+0 −4
Original line number Diff line number Diff line
@@ -75,7 +75,6 @@ static void omap_encoder_mode_set(struct drm_encoder *encoder, 
{

	struct omap_encoder *omap_encoder = to_omap_encoder(encoder);

	struct omap_dss_device *output = omap_encoder->output;

	struct omap_dss_device *dssdev;

	struct drm_device *dev = encoder->dev;

	struct drm_connector *connector;

	struct drm_bridge *bridge;
@@ -98,9 +97,6 @@ static void omap_encoder_mode_set(struct drm_encoder *encoder, 
	 *

	 * A better solution is to use DRM's bus-flags through the whole driver.

	 */

	for (dssdev = output; dssdev; dssdev = dssdev->next)

		omap_encoder_update_videomode_flags(&vm, dssdev->bus_flags);



	for (bridge = output->bridge; bridge;

	     bridge = drm_bridge_get_next_bridge(bridge)) {

		if (!bridge->timings)