@@ -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 = {
@@ -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 = {
@@ -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,
@@ -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,
@@ -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 = {
@@ -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 = {
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@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(-)