Commit a0e53bfe authored by Tomi Valkeinen's avatar Tomi Valkeinen

drm/omap: remove extra manager checks on disconnect

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: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 98df8448
...@@ -701,8 +701,7 @@ static void dpi_disconnect(struct omap_dss_device *dssdev, ...@@ -701,8 +701,7 @@ static void dpi_disconnect(struct omap_dss_device *dssdev,
omapdss_output_unset_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 = { static const struct omapdss_dpi_ops dpi_ops = {
......
...@@ -5019,8 +5019,7 @@ static void dsi_disconnect(struct omap_dss_device *dssdev, ...@@ -5019,8 +5019,7 @@ static void dsi_disconnect(struct omap_dss_device *dssdev,
omapdss_output_unset_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 = { static const struct omapdss_dsi_ops dsi_ops = {
......
...@@ -474,8 +474,7 @@ static void hdmi_disconnect(struct omap_dss_device *dssdev, ...@@ -474,8 +474,7 @@ static void hdmi_disconnect(struct omap_dss_device *dssdev,
omapdss_output_unset_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, static int hdmi_read_edid(struct omap_dss_device *dssdev,
......
...@@ -500,8 +500,7 @@ static void hdmi_disconnect(struct omap_dss_device *dssdev, ...@@ -500,8 +500,7 @@ static void hdmi_disconnect(struct omap_dss_device *dssdev,
omapdss_output_unset_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, static int hdmi_read_edid(struct omap_dss_device *dssdev,
......
...@@ -316,8 +316,7 @@ static void sdi_disconnect(struct omap_dss_device *dssdev, ...@@ -316,8 +316,7 @@ static void sdi_disconnect(struct omap_dss_device *dssdev,
omapdss_output_unset_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 = { static const struct omapdss_sdi_ops sdi_ops = {
......
...@@ -778,8 +778,7 @@ static void venc_disconnect(struct omap_dss_device *dssdev, ...@@ -778,8 +778,7 @@ static void venc_disconnect(struct omap_dss_device *dssdev,
omapdss_output_unset_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 = { static const struct omapdss_atv_ops venc_ops = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment