diff options
| author | Douglas Anderson <dianders@chromium.org> | 2022-01-05 16:13:40 -0800 |
|---|---|---|
| committer | Douglas Anderson <dianders@chromium.org> | 2022-01-05 16:13:40 -0800 |
| commit | ef1270e99460055ee7d66a4a22dd74bf61c17aa5 (patch) | |
| tree | 9cde5969ac70f1cdf84a4bbcc8adc2deacf4bb47 /drivers/gpu/drm/tidss/tidss_drv.c | |
| parent | 1a4af2e40c98b62c8aaf7cb692cd9600291d339b (diff) | |
| parent | cb6846fbb83b574c85c2a80211b402a6347b60b1 (diff) | |
Merge remote-tracking branch 'drm/drm-next' into drm-tip
# Conflicts:
# drivers/gpu/drm/nouveau/nouveau_fence.c
Diffstat (limited to 'drivers/gpu/drm/tidss/tidss_drv.c')
| -rw-r--r-- | drivers/gpu/drm/tidss/tidss_drv.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/gpu/drm/tidss/tidss_drv.c b/drivers/gpu/drm/tidss/tidss_drv.c index d620f35688da..7c784e90e40e 100644 --- a/drivers/gpu/drm/tidss/tidss_drv.c +++ b/drivers/gpu/drm/tidss/tidss_drv.c @@ -88,16 +88,11 @@ static int __maybe_unused tidss_resume(struct device *dev) return drm_mode_config_helper_resume(&tidss->ddev); } -#ifdef CONFIG_PM - -static const struct dev_pm_ops tidss_pm_ops = { - .runtime_suspend = tidss_pm_runtime_suspend, - .runtime_resume = tidss_pm_runtime_resume, +static __maybe_unused const struct dev_pm_ops tidss_pm_ops = { SET_SYSTEM_SLEEP_PM_OPS(tidss_suspend, tidss_resume) + SET_RUNTIME_PM_OPS(tidss_pm_runtime_suspend, tidss_pm_runtime_resume, NULL) }; -#endif /* CONFIG_PM */ - /* DRM device Information */ static void tidss_release(struct drm_device *ddev) @@ -250,9 +245,7 @@ static struct platform_driver tidss_platform_driver = { .shutdown = tidss_shutdown, .driver = { .name = "tidss", -#ifdef CONFIG_PM - .pm = &tidss_pm_ops, -#endif + .pm = pm_ptr(&tidss_pm_ops), .of_match_table = tidss_of_table, .suppress_bind_attrs = true, }, |