p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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: Tomi Valkeinen <tomi.valkeinen@ti.com>
This commit is contained in:
Tomi Valkeinen 2015-11-05 09:44:53 +02:00
parent 98df844806
commit a0e53bfe9f
6 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/gpu/drm/omapdrm/dss/dpi.c
View File

@ -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 = {

3
drivers/gpu/drm/omapdrm/dss/dsi.c
View File

@ -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 = {

3
drivers/gpu/drm/omapdrm/dss/hdmi4.c
View File

@ -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,

3
drivers/gpu/drm/omapdrm/dss/hdmi5.c
View File

@ -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,

3
drivers/gpu/drm/omapdrm/dss/sdi.c
View File

@ -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 = {

3
drivers/gpu/drm/omapdrm/dss/venc.c
View File

@ -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 = {