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

Commit 73fc0ac4 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Tomi Valkeinen
Browse files

drm/omap: displays: Don't call disconnect handlers directly 



In preparation for the move of checks from the disconnect handlers to
the omapdss_device_disconnect() function, replace direct calls to the
disconnect handlers at remove time with calls to
omapdss_device_disconnect().

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 1f507968

drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c

+1 −1
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ static int __exit tvc_remove(struct platform_device *pdev) 
	omapdss_unregister_display(&ddata->dssdev);



	tvc_disable(dssdev);

	tvc_disconnect(dssdev);

	omapdss_device_disconnect(dssdev, NULL);



	return 0;

}

drivers/gpu/drm/omapdrm/displays/connector-dvi.c

+1 −1
Original line number Diff line number Diff line
@@ -420,7 +420,7 @@ static int __exit dvic_remove(struct platform_device *pdev) 
	omapdss_unregister_display(&ddata->dssdev);



	dvic_disable(dssdev);

	dvic_disconnect(dssdev);

	omapdss_device_disconnect(dssdev, NULL);



	i2c_put_adapter(ddata->i2c_adapter);

drivers/gpu/drm/omapdrm/displays/connector-hdmi.c

+1 −1
Original line number Diff line number Diff line
@@ -375,7 +375,7 @@ static int __exit hdmic_remove(struct platform_device *pdev) 
	omapdss_unregister_display(&ddata->dssdev);



	hdmic_disable(dssdev);

	hdmic_disconnect(dssdev);

	omapdss_device_disconnect(dssdev, NULL);



	return 0;

}

drivers/gpu/drm/omapdrm/displays/encoder-opa362.c

+1 −1
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ static int __exit opa362_remove(struct platform_device *pdev) 


	WARN_ON(omapdss_device_is_connected(dssdev));

	if (omapdss_device_is_connected(dssdev))

		opa362_disconnect(dssdev, dssdev->dst);

		omapdss_device_disconnect(dssdev, dssdev->dst);



	return 0;

}

drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c

+1 −1
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ static int __exit tfp410_remove(struct platform_device *pdev) 


	WARN_ON(omapdss_device_is_connected(dssdev));

	if (omapdss_device_is_connected(dssdev))

		tfp410_disconnect(dssdev, dssdev->dst);

		omapdss_device_disconnect(dssdev, dssdev->dst);



	return 0;

}