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

Commit 74592ee7 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Tomi Valkeinen
Browse files

drm: omapdrm: Move shutdown() handler from core to dss 



In preparation for removal of the core module, move the shutdown()
handler from core to dss.

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

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

+0 −20
Original line number Diff line number Diff line
@@ -50,19 +50,6 @@ EXPORT_SYMBOL(omapdss_get_version); 


/* PLATFORM DEVICE */



static void dss_disable_all_devices(void)

{

	struct omap_dss_device *dssdev = NULL;



	for_each_dss_dev(dssdev) {

		if (!dssdev->driver)

			continue;



		if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE)

			dssdev->driver->disable(dssdev);

	}

}



static int __init omap_dss_probe(struct platform_device *pdev)

{

	core.pdev = pdev;
@@ -77,15 +64,8 @@ static int omap_dss_remove(struct platform_device *pdev) 
	return 0;

}



static void omap_dss_shutdown(struct platform_device *pdev)

{

	DSSDBG("shutdown\n");

	dss_disable_all_devices();

}



static struct platform_driver omap_dss_driver = {

	.remove         = omap_dss_remove,

	.shutdown	= omap_dss_shutdown,

	.driver         = {

		.name   = "omapdss",

	},

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

+16 −0
Original line number Diff line number Diff line
@@ -1380,6 +1380,21 @@ static int dss_remove(struct platform_device *pdev) 
	return 0;

}



static void dss_shutdown(struct platform_device *pdev)

{

	struct omap_dss_device *dssdev = NULL;



	DSSDBG("shutdown\n");



	for_each_dss_dev(dssdev) {

		if (!dssdev->driver)

			continue;



		if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE)

			dssdev->driver->disable(dssdev);

	}

}



static int dss_runtime_suspend(struct device *dev)

{

	dss_save_context();
@@ -1419,6 +1434,7 @@ static const struct dev_pm_ops dss_pm_ops = { 
static struct platform_driver omap_dsshw_driver = {

	.probe		= dss_probe,

	.remove		= dss_remove,

	.shutdown	= dss_shutdown,

	.driver         = {

		.name   = "omapdss_dss",

		.pm	= &dss_pm_ops,