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

Commit 43f7078f authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Tomi Valkeinen
Browse files

drm/omap: dss: Remove the dss_mgr_(dis)connect() operations 



The dss_mgr .connect() and .disconnect() are implemented as no-op in
omapdrm. The operations are unneeded, remove them.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarSebastian Reichel <sebastian.reichel@collabora.co.uk>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 0f37938c

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

+1 −9
Original line number Diff line number Diff line
@@ -616,15 +616,9 @@ static int dpi_connect(struct omap_dss_device *src, 


	dpi_init_pll(dpi);



	r = dss_mgr_connect(dst);

	if (r)

		return r;



	r = omapdss_device_connect(dst->dss, dst, dst->next);

	if (r) {

		dss_mgr_disconnect(dst);

	if (r)

		return r;

	}



	dst->dispc_channel_connected = true;

	return 0;
@@ -636,8 +630,6 @@ static void dpi_disconnect(struct omap_dss_device *src, 
	dst->dispc_channel_connected = false;



	omapdss_device_disconnect(dst, dst->next);



	dss_mgr_disconnect(dst);

}



static const struct omap_dss_device_ops dpi_ops = {

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

+1 −9
Original line number Diff line number Diff line
@@ -4886,15 +4886,9 @@ static int dsi_connect(struct omap_dss_device *src, 
{

	int r;



	r = dss_mgr_connect(dst);

	if (r)

		return r;



	r = omapdss_device_connect(dst->dss, dst, dst->next);

	if (r) {

		dss_mgr_disconnect(dst);

	if (r)

		return r;

	}



	dst->dispc_channel_connected = true;

	return 0;
@@ -4906,8 +4900,6 @@ static void dsi_disconnect(struct omap_dss_device *src, 
	dst->dispc_channel_connected = false;



	omapdss_device_disconnect(dst, dst->next);



	dss_mgr_disconnect(dst);

}



static const struct omap_dss_device_ops dsi_ops = {

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

+1 −9
Original line number Diff line number Diff line
@@ -433,15 +433,9 @@ static int hdmi_connect(struct omap_dss_device *src, 
{

	int r;



	r = dss_mgr_connect(dst);

	if (r)

		return r;



	r = omapdss_device_connect(dst->dss, dst, dst->next);

	if (r) {

		dss_mgr_disconnect(dst);

	if (r)

		return r;

	}



	dst->dispc_channel_connected = true;

	return 0;
@@ -453,8 +447,6 @@ static void hdmi_disconnect(struct omap_dss_device *src, 
	dst->dispc_channel_connected = false;



	omapdss_device_disconnect(dst, dst->next);



	dss_mgr_disconnect(dst);

}



static int hdmi_read_edid(struct omap_dss_device *dssdev,

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

+1 −9
Original line number Diff line number Diff line
@@ -438,15 +438,9 @@ static int hdmi_connect(struct omap_dss_device *src, 
{

	int r;



	r = dss_mgr_connect(dst);

	if (r)

		return r;



	r = omapdss_device_connect(dst->dss, dst, dst->next);

	if (r) {

		dss_mgr_disconnect(dst);

	if (r)

		return r;

	}



	dst->dispc_channel_connected = true;

	return 0;
@@ -458,8 +452,6 @@ static void hdmi_disconnect(struct omap_dss_device *src, 
	dst->dispc_channel_connected = false;



	omapdss_device_disconnect(dst, dst->next);



	dss_mgr_disconnect(dst);

}



static int hdmi_read_edid(struct omap_dss_device *dssdev,

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

+0 −9
Original line number Diff line number Diff line
@@ -554,13 +554,6 @@ enum dss_writeback_channel { 
};



struct dss_mgr_ops {

	int (*connect)(struct omap_drm_private *priv,

		       enum omap_channel channel,

		       struct omap_dss_device *dst);

	void (*disconnect)(struct omap_drm_private *priv,

			   enum omap_channel channel,

			   struct omap_dss_device *dst);



	void (*start_update)(struct omap_drm_private *priv,

			     enum omap_channel channel);

	int (*enable)(struct omap_drm_private *priv,
@@ -586,8 +579,6 @@ int dss_install_mgr_ops(struct dss_device *dss, 
			struct omap_drm_private *priv);

void dss_uninstall_mgr_ops(struct dss_device *dss);



int dss_mgr_connect(struct omap_dss_device *dssdev);

void dss_mgr_disconnect(struct omap_dss_device *dssdev);

void dss_mgr_set_timings(struct omap_dss_device *dssdev,

		const struct videomode *vm);

void dss_mgr_set_lcd_config(struct omap_dss_device *dssdev,