@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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);
@@ -188,10 +188,10 @@ void dss_uninstall_mgr_ops(void)
}
EXPORT_SYMBOL(dss_uninstall_mgr_ops);
-int dss_mgr_connect(struct omap_overlay_manager *mgr,
+int dss_mgr_connect(enum omap_channel channel,
struct omap_dss_device *dst)
{
- return dss_mgr_ops->connect(mgr->id, dst);
+ return dss_mgr_ops->connect(channel, dst);
}
EXPORT_SYMBOL(dss_mgr_connect);
@@ -291,7 +291,7 @@ static int sdi_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;
@@ -753,7 +753,7 @@ static int venc_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;
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: Tomi Valkeinen <tomi.valkeinen@ti.com> --- drivers/gpu/drm/omapdrm/dss/dpi.c | 2 +- drivers/gpu/drm/omapdrm/dss/dsi.c | 2 +- drivers/gpu/drm/omapdrm/dss/hdmi4.c | 2 +- drivers/gpu/drm/omapdrm/dss/hdmi5.c | 2 +- drivers/gpu/drm/omapdrm/dss/omapdss.h | 2 +- drivers/gpu/drm/omapdrm/dss/output.c | 4 ++-- drivers/gpu/drm/omapdrm/dss/sdi.c | 2 +- drivers/gpu/drm/omapdrm/dss/venc.c | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-)