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: Tomi Valkeinen <tomi.valkeinen@ti.com>

diff --git a/drivers/gpu/drm/omapdrm/dss/dpi.c b/drivers/gpu/drm/omapdrm/dss/dpi.c
index c4ebc7524a09bcc8d7c6461f779c431c7eda1ce3..064401bdb8a4854a2bf802cc8c8ff3e715912109 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/dpi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dpi.c
@@ -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;
 

diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c
index 5afbaac8f25af95ffc873cb66d6e6988409a98c8..3c5542afd9c98b0fdac18690e46a4d10b43bd7c0 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/dsi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dsi.c
@@ -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;
 

diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi4.c b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
index 5d8a5ed2d3bb0f17c1a7d2d2debe578a220af5ec..bbceea8b218aeb9a1b595e53e19940ea93411316 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/hdmi4.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
@@ -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;
 

diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi5.c b/drivers/gpu/drm/omapdrm/dss/hdmi5.c
index 24a14029112ddbe18b015ebac9504263092a0a4c..0b4105e89350345ab72a65ae4e3adf56644629ee 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/hdmi5.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi5.c
@@ -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;
 

diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h b/drivers/gpu/drm/omapdrm/dss/omapdss.h
index 640ba08735c5fc3d0f20688c1419cbae4e4df0fb..44086ce826472d206a079b01a89444c2c6e2ed71 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/omapdss.h
+++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h
@@ -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);

diff --git a/drivers/gpu/drm/omapdrm/dss/output.c b/drivers/gpu/drm/omapdrm/dss/output.c
index 69e081392ee5bca04e7d218de46a3ee3dc5e1d50..24de7cdff0fa1269947a66598a9d5cf2827d4b0b 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/output.c
+++ b/drivers/gpu/drm/omapdrm/dss/output.c
@@ -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);
 

diff --git a/drivers/gpu/drm/omapdrm/dss/sdi.c b/drivers/gpu/drm/omapdrm/dss/sdi.c
index 33d36ab4bcf754f8ebbff79183b44c1a4b5832d7..93077f7bc5007548805eb557049025623c51ffa7 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/sdi.c
+++ b/drivers/gpu/drm/omapdrm/dss/sdi.c
@@ -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;
 

diff --git a/drivers/gpu/drm/omapdrm/dss/venc.c b/drivers/gpu/drm/omapdrm/dss/venc.c
index 037c5b4e2ed6bc89d66e56c6f843806cf075bbbf..afc97891d476b474c354de67f06408163c746406 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/venc.c
+++ b/drivers/gpu/drm/omapdrm/dss/venc.c
@@ -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;