drm: apple: dcp: Port over to DEFINE_SIMPLE_DEV_PM_OPS

jannau · marcan · commit e178bc054d7e · 2023-11-19T15:41:45.000+09:00
Avoids ugly "__maybe_unused".

Signed-off-by: Janne Grunau &lt;j@jannau.net&gt;
diff --git a/drivers/gpu/drm/apple/dcp.c b/drivers/gpu/drm/apple/dcp.c
@@ -642,7 +642,7 @@ static void dcp_platform_shutdown(struct platform_device *pdev)
 	component_del(&pdev->dev, &dcp_comp_ops);
 }
 
-static __maybe_unused int dcp_platform_suspend(struct device *dev)
+static int dcp_platform_suspend(struct device *dev)
 {
 	/*
 	 * Set the device as a wakeup device, which forces its power
@@ -654,13 +654,13 @@ static __maybe_unused int dcp_platform_suspend(struct device *dev)
 	return 0;
 }
 
-static __maybe_unused int dcp_platform_resume(struct device *dev)
+static int dcp_platform_resume(struct device *dev)
 {
 	return 0;
 }
 
-static SIMPLE_DEV_PM_OPS(dcp_platform_pm_ops,
-			 dcp_platform_suspend, dcp_platform_resume);
+static DEFINE_SIMPLE_DEV_PM_OPS(dcp_platform_pm_ops,
+				dcp_platform_suspend, dcp_platform_resume);
 
 static const struct of_device_id of_match[] = {
 	{ .compatible = "apple,dcp" },

Original file line number	Diff line number	Diff line change
`@@ -642,7 +642,7 @@ static void dcp_platform_shutdown(struct platform_device *pdev)`
`642`	`642`	`component_del(&pdev->dev, &dcp_comp_ops);`
`643`	`643`	`}`
`644`	`644`
`645`		`-static __maybe_unused int dcp_platform_suspend(struct device *dev)`
	`645`	`+static int dcp_platform_suspend(struct device *dev)`
`646`	`646`	`{`
`647`	`647`	`/*`
`648`	`648`	`* Set the device as a wakeup device, which forces its power`
`@@ -654,13 +654,13 @@ static __maybe_unused int dcp_platform_suspend(struct device *dev)`
`654`	`654`	`return 0;`
`655`	`655`	`}`
`656`	`656`
`657`		`-static __maybe_unused int dcp_platform_resume(struct device *dev)`
	`657`	`+static int dcp_platform_resume(struct device *dev)`
`658`	`658`	`{`
`659`	`659`	`return 0;`
`660`	`660`	`}`
`661`	`661`
`662`		`-static SIMPLE_DEV_PM_OPS(dcp_platform_pm_ops,`
`663`		`- dcp_platform_suspend, dcp_platform_resume);`
	`662`	`+static DEFINE_SIMPLE_DEV_PM_OPS(dcp_platform_pm_ops,`
	`663`	`+ dcp_platform_suspend, dcp_platform_resume);`
`664`	`664`
`665`	`665`	`static const struct of_device_id of_match[] = {`
`666`	`666`	`{ .compatible = "apple,dcp" },`