drm/omap: dss: Remove the dss_mgr_(dis)connect() operations

The dss_mgr .connect() and .disconnect() are implemented as no-op in
omapdrm. The operations are unneeded, remove them.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
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 5b04cc5..f61e3e3 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/dpi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dpi.c
@@ -616,15 +616,9 @@ static int dpi_connect(struct omap_dss_device *src,
 
        dpi_init_pll(dpi);
 
-       r = dss_mgr_connect(dst);
-       if (r)
-               return r;
-
        r = omapdss_device_connect(dst->dss, dst, dst->next);
-       if (r) {
-               dss_mgr_disconnect(dst);
+       if (r)
                return r;
-       }
 
        dst->dispc_channel_connected = true;
        return 0;
@@ -636,8 +630,6 @@ static void dpi_disconnect(struct omap_dss_device *src,
        dst->dispc_channel_connected = false;
 
        omapdss_device_disconnect(dst, dst->next);
-
-       dss_mgr_disconnect(dst);
 }
 
 static const struct omap_dss_device_ops dpi_ops = {

diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c
index 921e794..0afefac 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/dsi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dsi.c
@@ -4886,15 +4886,9 @@ static int dsi_connect(struct omap_dss_device *src,
 {
        int r;
 
-       r = dss_mgr_connect(dst);
-       if (r)
-               return r;
-
        r = omapdss_device_connect(dst->dss, dst, dst->next);
-       if (r) {
-               dss_mgr_disconnect(dst);
+       if (r)
                return r;
-       }
 
        dst->dispc_channel_connected = true;
        return 0;
@@ -4906,8 +4900,6 @@ static void dsi_disconnect(struct omap_dss_device *src,
        dst->dispc_channel_connected = false;
 
        omapdss_device_disconnect(dst, dst->next);
-
-       dss_mgr_disconnect(dst);
 }
 
 static const struct omap_dss_device_ops dsi_ops = {

diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi4.c b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
index 1e025a8..c4fcdc9 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/hdmi4.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
@@ -433,15 +433,9 @@ static int hdmi_connect(struct omap_dss_device *src,
 {
        int r;
 
-       r = dss_mgr_connect(dst);
-       if (r)
-               return r;
-
        r = omapdss_device_connect(dst->dss, dst, dst->next);
-       if (r) {
-               dss_mgr_disconnect(dst);
+       if (r)
                return r;
-       }
 
        dst->dispc_channel_connected = true;
        return 0;
@@ -453,8 +447,6 @@ static void hdmi_disconnect(struct omap_dss_device *src,
        dst->dispc_channel_connected = false;
 
        omapdss_device_disconnect(dst, dst->next);
-
-       dss_mgr_disconnect(dst);
 }
 
 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 d586043..889c317 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/hdmi5.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi5.c
@@ -438,15 +438,9 @@ static int hdmi_connect(struct omap_dss_device *src,
 {
        int r;
 
-       r = dss_mgr_connect(dst);
-       if (r)
-               return r;
-
        r = omapdss_device_connect(dst->dss, dst, dst->next);
-       if (r) {
-               dss_mgr_disconnect(dst);
+       if (r)
                return r;
-       }
 
        dst->dispc_channel_connected = true;
        return 0;
@@ -458,8 +452,6 @@ static void hdmi_disconnect(struct omap_dss_device *src,
        dst->dispc_channel_connected = false;
 
        omapdss_device_disconnect(dst, dst->next);
-
-       dss_mgr_disconnect(dst);
 }
 
 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 8ef0ac3..c00572e 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/omapdss.h
+++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h
@@ -554,13 +554,6 @@ enum dss_writeback_channel {
 };
 
 struct dss_mgr_ops {
-       int (*connect)(struct omap_drm_private *priv,
-                      enum omap_channel channel,
-                      struct omap_dss_device *dst);
-       void (*disconnect)(struct omap_drm_private *priv,
-                          enum omap_channel channel,
-                          struct omap_dss_device *dst);
-
        void (*start_update)(struct omap_drm_private *priv,
                             enum omap_channel channel);
        int (*enable)(struct omap_drm_private *priv,
@@ -586,8 +579,6 @@ 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);
-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,

diff --git a/drivers/gpu/drm/omapdrm/dss/output.c b/drivers/gpu/drm/omapdrm/dss/output.c
index 2da480b..18505bc 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/output.c
+++ b/drivers/gpu/drm/omapdrm/dss/output.c
@@ -56,20 +56,6 @@ void dss_uninstall_mgr_ops(struct dss_device *dss)
 }
 EXPORT_SYMBOL(dss_uninstall_mgr_ops);
 
-int dss_mgr_connect(struct omap_dss_device *dssdev)
-{
-       return dssdev->dss->mgr_ops->connect(dssdev->dss->mgr_ops_priv,
-                                            dssdev->dispc_channel, dssdev);
-}
-EXPORT_SYMBOL(dss_mgr_connect);
-
-void dss_mgr_disconnect(struct omap_dss_device *dssdev)
-{
-       dssdev->dss->mgr_ops->disconnect(dssdev->dss->mgr_ops_priv,
-                                        dssdev->dispc_channel, dssdev);
-}
-EXPORT_SYMBOL(dss_mgr_disconnect);
-
 void dss_mgr_set_timings(struct omap_dss_device *dssdev,
                         const struct videomode *vm)
 {

diff --git a/drivers/gpu/drm/omapdrm/dss/sdi.c b/drivers/gpu/drm/omapdrm/dss/sdi.c
index b741884..8d46f44 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/sdi.c
+++ b/drivers/gpu/drm/omapdrm/dss/sdi.c
@@ -257,15 +257,9 @@ static int sdi_connect(struct omap_dss_device *src,
 {
        int r;
 
-       r = dss_mgr_connect(dst);
-       if (r)
-               return r;
-
        r = omapdss_device_connect(dst->dss, dst, dst->next);
-       if (r) {
-               dss_mgr_disconnect(dst);
+       if (r)
                return r;
-       }
 
        dst->dispc_channel_connected = true;
        return 0;
@@ -277,8 +271,6 @@ static void sdi_disconnect(struct omap_dss_device *src,
        dst->dispc_channel_connected = false;
 
        omapdss_device_disconnect(dst, dst->next);
-
-       dss_mgr_disconnect(dst);
 }
 
 static const struct omap_dss_device_ops sdi_ops = {

diff --git a/drivers/gpu/drm/omapdrm/dss/venc.c b/drivers/gpu/drm/omapdrm/dss/venc.c
index 00421e2..100a02a 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/venc.c
+++ b/drivers/gpu/drm/omapdrm/dss/venc.c
@@ -696,15 +696,9 @@ static int venc_connect(struct omap_dss_device *src,
 {
        int r;
 
-       r = dss_mgr_connect(dst);
-       if (r)
-               return r;
-
        r = omapdss_device_connect(dst->dss, dst, dst->next);
-       if (r) {
-               dss_mgr_disconnect(dst);
+       if (r)
                return r;
-       }
 
        dst->dispc_channel_connected = true;
        return 0;
@@ -716,8 +710,6 @@ static void venc_disconnect(struct omap_dss_device *src,
        dst->dispc_channel_connected = false;
 
        omapdss_device_disconnect(dst, dst->next);
-
-       dss_mgr_disconnect(dst);
 }
 
 static const struct omap_dss_device_ops venc_ops = {

diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c b/drivers/gpu/drm/omapdrm/omap_crtc.c
index 7f83769..80498dc 100644 (file)
--- a/drivers/gpu/drm/omapdrm/omap_crtc.c
+++ b/drivers/gpu/drm/omapdrm/omap_crtc.c
@@ -110,19 +110,6 @@ int omap_crtc_wait_pending(struct drm_crtc *crtc)
  */
 
 /* we can probably ignore these until we support command-mode panels: */
-static int omap_crtc_dss_connect(struct omap_drm_private *priv,
-               enum omap_channel channel,
-               struct omap_dss_device *dst)
-{
-       return 0;
-}
-
-static void omap_crtc_dss_disconnect(struct omap_drm_private *priv,
-               enum omap_channel channel,
-               struct omap_dss_device *dst)
-{
-}
-
 static void omap_crtc_dss_start_update(struct omap_drm_private *priv,
                                       enum omap_channel channel)
 {
@@ -254,8 +241,6 @@ static void omap_crtc_dss_unregister_framedone(
 }
 
 static const struct dss_mgr_ops mgr_ops = {
-       .connect = omap_crtc_dss_connect,
-       .disconnect = omap_crtc_dss_disconnect,
        .start_update = omap_crtc_dss_start_update,
        .enable = omap_crtc_dss_enable,
        .disable = omap_crtc_dss_disable,