Commit 006f3b2f authored by Paul Cercueil's avatar Paul Cercueil

drm/ingenic: Use the new PM macros

- Use DEFINE_SIMPLE_DEV_PM_OPS() instead of the SIMPLE_DEV_PM_OPS()
  macro. This makes it possible to remove the __maybe_unused flags on
  the callback functions.
- Since we only have callbacks for suspend/resume, we can conditionally
  compile the dev_pm_ops structure for when CONFIG_PM_SLEEP is enabled;
  so use the pm_sleep_ptr() macro instead of pm_ptr().
Signed-off-by: default avatarPaul Cercueil <paul@crapouillou.net>
Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20220708205406.96473-7-paul@crapouillou.net
parent c167ee1f
...@@ -1464,21 +1464,22 @@ static int ingenic_drm_remove(struct platform_device *pdev) ...@@ -1464,21 +1464,22 @@ static int ingenic_drm_remove(struct platform_device *pdev)
return 0; return 0;
} }
static int __maybe_unused ingenic_drm_suspend(struct device *dev) static int ingenic_drm_suspend(struct device *dev)
{ {
struct ingenic_drm *priv = dev_get_drvdata(dev); struct ingenic_drm *priv = dev_get_drvdata(dev);
return drm_mode_config_helper_suspend(&priv->drm); return drm_mode_config_helper_suspend(&priv->drm);
} }
static int __maybe_unused ingenic_drm_resume(struct device *dev) static int ingenic_drm_resume(struct device *dev)
{ {
struct ingenic_drm *priv = dev_get_drvdata(dev); struct ingenic_drm *priv = dev_get_drvdata(dev);
return drm_mode_config_helper_resume(&priv->drm); return drm_mode_config_helper_resume(&priv->drm);
} }
static SIMPLE_DEV_PM_OPS(ingenic_drm_pm_ops, ingenic_drm_suspend, ingenic_drm_resume); static DEFINE_SIMPLE_DEV_PM_OPS(ingenic_drm_pm_ops,
ingenic_drm_suspend, ingenic_drm_resume);
static const u32 jz4740_formats[] = { static const u32 jz4740_formats[] = {
DRM_FORMAT_XRGB1555, DRM_FORMAT_XRGB1555,
...@@ -1609,7 +1610,7 @@ MODULE_DEVICE_TABLE(of, ingenic_drm_of_match); ...@@ -1609,7 +1610,7 @@ MODULE_DEVICE_TABLE(of, ingenic_drm_of_match);
static struct platform_driver ingenic_drm_driver = { static struct platform_driver ingenic_drm_driver = {
.driver = { .driver = {
.name = "ingenic-drm", .name = "ingenic-drm",
.pm = pm_ptr(&ingenic_drm_pm_ops), .pm = pm_sleep_ptr(&ingenic_drm_pm_ops),
.of_match_table = of_match_ptr(ingenic_drm_of_match), .of_match_table = of_match_ptr(ingenic_drm_of_match),
}, },
.probe = ingenic_drm_probe, .probe = ingenic_drm_probe,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment