Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a0e53bfe authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

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

drivers/gpu/drm/omapdrm/dss/dpi.c

+1 −2
Original line number Diff line number Diff line
@@ -701,7 +701,6 @@ static void dpi_disconnect(struct omap_dss_device *dssdev, 


	omapdss_output_unset_device(dssdev);



	if (dssdev->manager)

	dss_mgr_disconnect(dssdev->manager->id, dssdev);

}

drivers/gpu/drm/omapdrm/dss/dsi.c

+1 −2
Original line number Diff line number Diff line
@@ -5019,7 +5019,6 @@ static void dsi_disconnect(struct omap_dss_device *dssdev, 


	omapdss_output_unset_device(dssdev);



	if (dssdev->manager)

	dss_mgr_disconnect(dssdev->manager->id, dssdev);

}

drivers/gpu/drm/omapdrm/dss/hdmi4.c

+1 −2
Original line number Diff line number Diff line
@@ -474,7 +474,6 @@ static void hdmi_disconnect(struct omap_dss_device *dssdev, 


	omapdss_output_unset_device(dssdev);



	if (dssdev->manager)

	dss_mgr_disconnect(dssdev->manager->id, dssdev);

}

drivers/gpu/drm/omapdrm/dss/hdmi5.c

+1 −2
Original line number Diff line number Diff line
@@ -500,7 +500,6 @@ static void hdmi_disconnect(struct omap_dss_device *dssdev, 


	omapdss_output_unset_device(dssdev);



	if (dssdev->manager)

	dss_mgr_disconnect(dssdev->manager->id, dssdev);

}

drivers/gpu/drm/omapdrm/dss/sdi.c

+1 −2
Original line number Diff line number Diff line
@@ -316,7 +316,6 @@ static void sdi_disconnect(struct omap_dss_device *dssdev, 


	omapdss_output_unset_device(dssdev);



	if (dssdev->manager)

	dss_mgr_disconnect(dssdev->manager->id, dssdev);

}