drm/omap: convert dss_mgr_disconnect to accept omap_channel

We are removing uses of 'struct omap_overlay_manager'. This patch
changes dss_mgr_disconnect() 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 064401bdb8a4854a2bf802cc8c8ff3e715912109..a877cfebd2d5e53ea64f6d0ecdb5aef831158a25 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/dpi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dpi.c
@@ -684,7 +684,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(mgr, dssdev);
+               dss_mgr_disconnect(mgr->id, dssdev);
                return r;
        }
 
@@ -702,7 +702,7 @@ static void dpi_disconnect(struct omap_dss_device *dssdev,
        omapdss_output_unset_device(dssdev);
 
        if (dssdev->manager)
-               dss_mgr_disconnect(dssdev->manager, dssdev);
+               dss_mgr_disconnect(dssdev->manager->id, dssdev);
 }
 
 static const struct omapdss_dpi_ops dpi_ops = {

diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c
index 3c5542afd9c98b0fdac18690e46a4d10b43bd7c0..a2c83691506f2bcac48349572f53ee5bc05c1df4 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/dsi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dsi.c
@@ -5002,7 +5002,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(mgr, dssdev);
+               dss_mgr_disconnect(mgr->id, dssdev);
                return r;
        }
 
@@ -5020,7 +5020,7 @@ static void dsi_disconnect(struct omap_dss_device *dssdev,
        omapdss_output_unset_device(dssdev);
 
        if (dssdev->manager)
-               dss_mgr_disconnect(dssdev->manager, dssdev);
+               dss_mgr_disconnect(dssdev->manager->id, dssdev);
 }
 
 static const struct omapdss_dsi_ops dsi_ops = {

diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi4.c b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
index bbceea8b218aeb9a1b595e53e19940ea93411316..6fd7d06d32ff1fd42de71cdb35b92cd6f8bd771a 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/hdmi4.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
@@ -457,7 +457,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(mgr, dssdev);
+               dss_mgr_disconnect(mgr->id, dssdev);
                return r;
        }
 
@@ -475,7 +475,7 @@ static void hdmi_disconnect(struct omap_dss_device *dssdev,
        omapdss_output_unset_device(dssdev);
 
        if (dssdev->manager)
-               dss_mgr_disconnect(dssdev->manager, dssdev);
+               dss_mgr_disconnect(dssdev->manager->id, dssdev);
 }
 
 static int hdmi_read_edid(struct omap_dss_device *dssdev,

diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi5.c b/drivers/gpu/drm/omapdrm/dss/hdmi5.c
index 0b4105e89350345ab72a65ae4e3adf56644629ee..9501de47391619e161f0c139550023d8596672fd 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/hdmi5.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi5.c
@@ -483,7 +483,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(mgr, dssdev);
+               dss_mgr_disconnect(mgr->id, dssdev);
                return r;
        }
 
@@ -501,7 +501,7 @@ static void hdmi_disconnect(struct omap_dss_device *dssdev,
        omapdss_output_unset_device(dssdev);
 
        if (dssdev->manager)
-               dss_mgr_disconnect(dssdev->manager, dssdev);
+               dss_mgr_disconnect(dssdev->manager->id, dssdev);
 }
 
 static int hdmi_read_edid(struct omap_dss_device *dssdev,

diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h b/drivers/gpu/drm/omapdrm/dss/omapdss.h
index 44086ce826472d206a079b01a89444c2c6e2ed71..38da4be6ff1578940c4e970529a83ebd898f6b4b 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/omapdss.h
+++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h
@@ -84,7 +84,7 @@ void dss_uninstall_mgr_ops(void);
 
 int dss_mgr_connect(enum omap_channel channel,
                struct omap_dss_device *dst);
-void dss_mgr_disconnect(struct omap_overlay_manager *mgr,
+void dss_mgr_disconnect(enum omap_channel channel,
                struct omap_dss_device *dst);
 void dss_mgr_set_timings(struct omap_overlay_manager *mgr,
                const struct omap_video_timings *timings);

diff --git a/drivers/gpu/drm/omapdrm/dss/output.c b/drivers/gpu/drm/omapdrm/dss/output.c
index 24de7cdff0fa1269947a66598a9d5cf2827d4b0b..0ca46f37681fdc6d7ecb710d44570daeb22882c1 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/output.c
+++ b/drivers/gpu/drm/omapdrm/dss/output.c
@@ -195,10 +195,10 @@ int dss_mgr_connect(enum omap_channel channel,
 }
 EXPORT_SYMBOL(dss_mgr_connect);
 
-void dss_mgr_disconnect(struct omap_overlay_manager *mgr,
+void dss_mgr_disconnect(enum omap_channel channel,
                struct omap_dss_device *dst)
 {
-       dss_mgr_ops->disconnect(mgr->id, dst);
+       dss_mgr_ops->disconnect(channel, dst);
 }
 EXPORT_SYMBOL(dss_mgr_disconnect);
 

diff --git a/drivers/gpu/drm/omapdrm/dss/sdi.c b/drivers/gpu/drm/omapdrm/dss/sdi.c
index 93077f7bc5007548805eb557049025623c51ffa7..0d9f40646a34afe7e2973dcb992cd6e4c284ee2a 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/sdi.c
+++ b/drivers/gpu/drm/omapdrm/dss/sdi.c
@@ -299,7 +299,7 @@ static int sdi_connect(struct omap_dss_device *dssdev,
        if (r) {
                DSSERR("failed to connect output to new device: %s\n",
                                dst->name);
-               dss_mgr_disconnect(mgr, dssdev);
+               dss_mgr_disconnect(mgr->id, dssdev);
                return r;
        }
 
@@ -317,7 +317,7 @@ static void sdi_disconnect(struct omap_dss_device *dssdev,
        omapdss_output_unset_device(dssdev);
 
        if (dssdev->manager)
-               dss_mgr_disconnect(dssdev->manager, dssdev);
+               dss_mgr_disconnect(dssdev->manager->id, dssdev);
 }
 
 static const struct omapdss_sdi_ops sdi_ops = {

diff --git a/drivers/gpu/drm/omapdrm/dss/venc.c b/drivers/gpu/drm/omapdrm/dss/venc.c
index afc97891d476b474c354de67f06408163c746406..2a4bd2537040d7e2a2b7e3bbf5f9538c23059642 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/venc.c
+++ b/drivers/gpu/drm/omapdrm/dss/venc.c
@@ -761,7 +761,7 @@ static int venc_connect(struct omap_dss_device *dssdev,
        if (r) {
                DSSERR("failed to connect output to new device: %s\n",
                                dst->name);
-               dss_mgr_disconnect(mgr, dssdev);
+               dss_mgr_disconnect(mgr->id, dssdev);
                return r;
        }
 
@@ -779,7 +779,7 @@ static void venc_disconnect(struct omap_dss_device *dssdev,
        omapdss_output_unset_device(dssdev);
 
        if (dssdev->manager)
-               dss_mgr_disconnect(dssdev->manager, dssdev);
+               dss_mgr_disconnect(dssdev->manager->id, dssdev);
 }
 
 static const struct omapdss_atv_ops venc_ops = {