@@ -164,7 +164,6 @@ static const struct drm_driver fsl_dcu_drm_driver = {
.minor = 1,
};
-#ifdef CONFIG_PM_SLEEP
static int fsl_dcu_drm_pm_suspend(struct device *dev)
{
struct fsl_dcu_drm_device *fsl_dev = dev_get_drvdata(dev);
@@ -209,11 +208,9 @@ static int fsl_dcu_drm_pm_resume(struct device *dev)
return 0;
}
-#endif
-static const struct dev_pm_ops fsl_dcu_drm_pm_ops = {
- SET_SYSTEM_SLEEP_PM_OPS(fsl_dcu_drm_pm_suspend, fsl_dcu_drm_pm_resume)
-};
+static DEFINE_SIMPLE_DEV_PM_OPS(fsl_dcu_drm_pm_ops,
+ fsl_dcu_drm_pm_suspend, fsl_dcu_drm_pm_resume);
static const struct fsl_dcu_soc_data fsl_dcu_ls1021a_data = {
.name = "ls1021a",
@@ -363,7 +360,7 @@ static struct platform_driver fsl_dcu_drm_platform_driver = {
.remove = fsl_dcu_drm_remove,
.driver = {
.name = "fsl-dcu",
- .pm = &fsl_dcu_drm_pm_ops,
+ .pm = pm_sleep_ptr(&fsl_dcu_drm_pm_ops),
.of_match_table = fsl_dcu_of_match,
},
};
Use the DEFINE_SIMPLE_DEV_PM_OPS() and pm_sleep_ptr() macros to handle the .suspend/.resume callbacks. These macros allow the suspend and resume functions to be automatically dropped by the compiler when CONFIG_SUSPEND is disabled, without having to use #ifdef guards. This has the advantage of always compiling these functions in, independently of any Kconfig option. Thanks to that, bugs and other regressions are subsequently easier to catch. Signed-off-by: Paul Cercueil <paul@crapouillou.net> --- Cc: Stefan Agner <stefan@agner.ch> Cc: Alison Wang <alison.wang@nxp.com> --- drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)