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

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

drm/omap: dss: Remove duplicated parameter to dss_mgr_(dis)connect() 



The dss_mgr_connect() and dss_mgr_disconnect() functions take two
omap_dss_device pointers as parameters, which are always set to the same
value by all callers. Remove the duplicated pointer.

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 bea13196

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

+3 −5
Original line number Diff line number Diff line
@@ -652,7 +652,7 @@ static int dpi_connect(struct omap_dss_device *dssdev, 


	dpi_init_pll(dpi);



	r = dss_mgr_connect(&dpi->output, dssdev);

	r = dss_mgr_connect(dssdev);

	if (r)

		return r;
@@ -660,7 +660,7 @@ static int dpi_connect(struct omap_dss_device *dssdev, 
	if (r) {

		DSSERR("failed to connect output to new device: %s\n",

				dst->name);

		dss_mgr_disconnect(&dpi->output, dssdev);

		dss_mgr_disconnect(dssdev);

		return r;

	}
@@ -670,11 +670,9 @@ static int dpi_connect(struct omap_dss_device *dssdev, 
static void dpi_disconnect(struct omap_dss_device *dssdev,

		struct omap_dss_device *dst)

{

	struct dpi_data *dpi = dpi_get_data_from_dssdev(dssdev);



	omapdss_output_unset_device(dssdev);



	dss_mgr_disconnect(&dpi->output, dssdev);

	dss_mgr_disconnect(dssdev);

}



static const struct omap_dss_device_ops dpi_ops = {

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

+3 −5
Original line number Diff line number Diff line
@@ -4915,7 +4915,7 @@ static int dsi_connect(struct omap_dss_device *dssdev, 
	if (r)

		return r;



	r = dss_mgr_connect(&dsi->output, dssdev);

	r = dss_mgr_connect(dssdev);

	if (r)

		return r;
@@ -4923,7 +4923,7 @@ static int dsi_connect(struct omap_dss_device *dssdev, 
	if (r) {

		DSSERR("failed to connect output to new device: %s\n",

				dssdev->name);

		dss_mgr_disconnect(&dsi->output, dssdev);

		dss_mgr_disconnect(dssdev);

		return r;

	}
@@ -4933,11 +4933,9 @@ static int dsi_connect(struct omap_dss_device *dssdev, 
static void dsi_disconnect(struct omap_dss_device *dssdev,

		struct omap_dss_device *dst)

{

	struct dsi_data *dsi = to_dsi_data(dssdev);



	omapdss_output_unset_device(dssdev);



	dss_mgr_disconnect(&dsi->output, dssdev);

	dss_mgr_disconnect(dssdev);

}



static const struct omap_dss_device_ops dsi_ops = {

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

+3 −5
Original line number Diff line number Diff line
@@ -458,7 +458,7 @@ static int hdmi_connect(struct omap_dss_device *dssdev, 
	if (r)

		return r;



	r = dss_mgr_connect(&hdmi->output, dssdev);

	r = dss_mgr_connect(dssdev);

	if (r)

		return r;
@@ -466,7 +466,7 @@ static int hdmi_connect(struct omap_dss_device *dssdev, 
	if (r) {

		DSSERR("failed to connect output to new device: %s\n",

				dst->name);

		dss_mgr_disconnect(&hdmi->output, dssdev);

		dss_mgr_disconnect(dssdev);

		return r;

	}
@@ -476,11 +476,9 @@ static int hdmi_connect(struct omap_dss_device *dssdev, 
static void hdmi_disconnect(struct omap_dss_device *dssdev,

		struct omap_dss_device *dst)

{

	struct omap_hdmi *hdmi = dssdev_to_hdmi(dssdev);



	omapdss_output_unset_device(dssdev);



	dss_mgr_disconnect(&hdmi->output, dssdev);

	dss_mgr_disconnect(dssdev);

}



static int hdmi_read_edid(struct omap_dss_device *dssdev,

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

+3 −5
Original line number Diff line number Diff line
@@ -461,7 +461,7 @@ static int hdmi_connect(struct omap_dss_device *dssdev, 
	if (r)

		return r;



	r = dss_mgr_connect(&hdmi->output, dssdev);

	r = dss_mgr_connect(dssdev);

	if (r)

		return r;
@@ -469,7 +469,7 @@ static int hdmi_connect(struct omap_dss_device *dssdev, 
	if (r) {

		DSSERR("failed to connect output to new device: %s\n",

				dst->name);

		dss_mgr_disconnect(&hdmi->output, dssdev);

		dss_mgr_disconnect(dssdev);

		return r;

	}
@@ -479,11 +479,9 @@ static int hdmi_connect(struct omap_dss_device *dssdev, 
static void hdmi_disconnect(struct omap_dss_device *dssdev,

		struct omap_dss_device *dst)

{

	struct omap_hdmi *hdmi = dssdev_to_hdmi(dssdev);



	omapdss_output_unset_device(dssdev);



	dss_mgr_disconnect(&hdmi->output, dssdev);

	dss_mgr_disconnect(dssdev);

}



static int hdmi_read_edid(struct omap_dss_device *dssdev,

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

+2 −4
Original line number Diff line number Diff line
@@ -587,10 +587,8 @@ 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,

		    struct omap_dss_device *dst);

void dss_mgr_disconnect(struct omap_dss_device *dssdev,

			struct omap_dss_device *dst);

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,