[PATCH 33/42] drm/omap: remove extra manager checks on disconnect

[Tomi Valkeinen]

The DSS output drivers check 'dssdev->manager' in disconnect()
functions. This check is not needed as the manager must always be set if
the output device was connected. Remove the check.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen at ti.com>
---
 drivers/gpu/drm/omapdrm/dss/dpi.c   | 3 +--
 drivers/gpu/drm/omapdrm/dss/dsi.c   | 3 +--
 drivers/gpu/drm/omapdrm/dss/hdmi4.c | 3 +--
 drivers/gpu/drm/omapdrm/dss/hdmi5.c | 3 +--
 drivers/gpu/drm/omapdrm/dss/sdi.c   | 3 +--
 drivers/gpu/drm/omapdrm/dss/venc.c  | 3 +--
 6 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/dss/dpi.c 
b/drivers/gpu/drm/omapdrm/dss/dpi.c
index d4be2444b2ea..c73d3651ca10 100644
--- a/drivers/gpu/drm/omapdrm/dss/dpi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dpi.c
@@ -701,8 +701,7 @@ static void dpi_disconnect(struct omap_dss_device *dssdev,

        omapdss_output_unset_device(dssdev);

-       if (dssdev->manager)
-               dss_mgr_disconnect(dssdev->manager->id, 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 10099f75364d..d00c6a31602d 100644
--- a/drivers/gpu/drm/omapdrm/dss/dsi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dsi.c
@@ -5019,8 +5019,7 @@ static void dsi_disconnect(struct omap_dss_device *dssdev,

        omapdss_output_unset_device(dssdev);

-       if (dssdev->manager)
-               dss_mgr_disconnect(dssdev->manager->id, 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 f8ed407f148e..a222fc5089a5 100644
--- a/drivers/gpu/drm/omapdrm/dss/hdmi4.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
@@ -474,8 +474,7 @@ static void hdmi_disconnect(struct omap_dss_device *dssdev,

        omapdss_output_unset_device(dssdev);

-       if (dssdev->manager)
-               dss_mgr_disconnect(dssdev->manager->id, 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 b75f15e15797..33cda9bcf952 100644
--- a/drivers/gpu/drm/omapdrm/dss/hdmi5.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi5.c
@@ -500,8 +500,7 @@ static void hdmi_disconnect(struct omap_dss_device *dssdev,

        omapdss_output_unset_device(dssdev);

-       if (dssdev->manager)
-               dss_mgr_disconnect(dssdev->manager->id, 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/sdi.c 
b/drivers/gpu/drm/omapdrm/dss/sdi.c
index 0526f24ed8a9..dee40ba9a296 100644
--- a/drivers/gpu/drm/omapdrm/dss/sdi.c
+++ b/drivers/gpu/drm/omapdrm/dss/sdi.c
@@ -316,8 +316,7 @@ static void sdi_disconnect(struct omap_dss_device *dssdev,

        omapdss_output_unset_device(dssdev);

-       if (dssdev->manager)
-               dss_mgr_disconnect(dssdev->manager->id, 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 401c477242b1..d514c9878ae2 100644
--- a/drivers/gpu/drm/omapdrm/dss/venc.c
+++ b/drivers/gpu/drm/omapdrm/dss/venc.c
@@ -778,8 +778,7 @@ static void venc_disconnect(struct omap_dss_device *dssdev,

        omapdss_output_unset_device(dssdev);

-       if (dssdev->manager)
-               dss_mgr_disconnect(dssdev->manager->id, dssdev);
+       dss_mgr_disconnect(dssdev->manager->id, dssdev);
 }

 static const struct omapdss_atv_ops venc_ops = {
-- 
2.5.0