Commit 66284ff9 authored by Paul Cercueil's avatar Paul Cercueil

drm: vboxvideo: Remove #ifdef guards for PM related functions

Use the pm_sleep_ptr() macro to handle the .suspend / .resume callbacks.

This macro allows 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: default avatarPaul Cercueil <paul@crapouillou.net>
Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221129191942.138244-9-paul@crapouillou.net
parent 8d1c4e59
...@@ -102,7 +102,6 @@ static void vbox_pci_remove(struct pci_dev *pdev) ...@@ -102,7 +102,6 @@ static void vbox_pci_remove(struct pci_dev *pdev)
vbox_hw_fini(vbox); vbox_hw_fini(vbox);
} }
#ifdef CONFIG_PM_SLEEP
static int vbox_pm_suspend(struct device *dev) static int vbox_pm_suspend(struct device *dev)
{ {
struct vbox_private *vbox = dev_get_drvdata(dev); struct vbox_private *vbox = dev_get_drvdata(dev);
...@@ -160,16 +159,13 @@ static const struct dev_pm_ops vbox_pm_ops = { ...@@ -160,16 +159,13 @@ static const struct dev_pm_ops vbox_pm_ops = {
.poweroff = vbox_pm_poweroff, .poweroff = vbox_pm_poweroff,
.restore = vbox_pm_resume, .restore = vbox_pm_resume,
}; };
#endif
static struct pci_driver vbox_pci_driver = { static struct pci_driver vbox_pci_driver = {
.name = DRIVER_NAME, .name = DRIVER_NAME,
.id_table = pciidlist, .id_table = pciidlist,
.probe = vbox_pci_probe, .probe = vbox_pci_probe,
.remove = vbox_pci_remove, .remove = vbox_pci_remove,
#ifdef CONFIG_PM_SLEEP .driver.pm = pm_sleep_ptr(&vbox_pm_ops),
.driver.pm = &vbox_pm_ops,
#endif
}; };
DEFINE_DRM_GEM_FOPS(vbox_fops); DEFINE_DRM_GEM_FOPS(vbox_fops);
......
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