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

Commit 1b07b066 authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

drm/omap: convert dss_mgr_connect to accept omap_channel 



We are removing uses of 'struct omap_overlay_manager'. This patch
changes dss_mgr_connect() to accept 'enum omap_channel' instead of
'struct omap_overlay_manager'.

Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent f1504ad0

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

+1 −1
Original line number Diff line number Diff line
@@ -676,7 +676,7 @@ static int dpi_connect(struct omap_dss_device *dssdev, 
	if (!mgr)

		return -ENODEV;



	r = dss_mgr_connect(mgr, dssdev);

	r = dss_mgr_connect(mgr->id, dssdev);

	if (r)

		return r;

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

+1 −1
Original line number Diff line number Diff line
@@ -4994,7 +4994,7 @@ static int dsi_connect(struct omap_dss_device *dssdev, 
	if (!mgr)

		return -ENODEV;



	r = dss_mgr_connect(mgr, dssdev);

	r = dss_mgr_connect(mgr->id, dssdev);

	if (r)

		return r;

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

+1 −1
Original line number Diff line number Diff line
@@ -449,7 +449,7 @@ static int hdmi_connect(struct omap_dss_device *dssdev, 
	if (!mgr)

		return -ENODEV;



	r = dss_mgr_connect(mgr, dssdev);

	r = dss_mgr_connect(mgr->id, dssdev);

	if (r)

		return r;

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

+1 −1
Original line number Diff line number Diff line
@@ -475,7 +475,7 @@ static int hdmi_connect(struct omap_dss_device *dssdev, 
	if (!mgr)

		return -ENODEV;



	r = dss_mgr_connect(mgr, dssdev);

	r = dss_mgr_connect(mgr->id, dssdev);

	if (r)

		return r;

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

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ struct dss_mgr_ops { 
int dss_install_mgr_ops(const struct dss_mgr_ops *mgr_ops);

void dss_uninstall_mgr_ops(void);



int dss_mgr_connect(struct omap_overlay_manager *mgr,

int dss_mgr_connect(enum omap_channel channel,

		struct omap_dss_device *dst);

void dss_mgr_disconnect(struct omap_overlay_manager *mgr,

		struct omap_dss_device *dst);