Use the new DEFINE_DRM_MODE_CONFIG_HELPER_PM_OPS() macro to create a "struct dev_pm_ops" that can be used by this driver, instead of using custom PM callbacks with the same behaviour. v2: Use the DEFINE_DRM_MODE_CONFIG_HELPER_PM_OPS() macro instead of an exported dev_pm_ops. Signed-off-by: Paul Cercueil <paul@xxxxxxxxxxxxxxx> --- Cc: Gerd Hoffmann <kraxel@xxxxxxxxxx> Cc: virtualization@xxxxxxxxxxxxxxxxxxxxxxxxxx --- drivers/gpu/drm/tiny/bochs.c | 29 ++++------------------------- 1 file changed, 4 insertions(+), 25 deletions(-) diff --git a/drivers/gpu/drm/tiny/bochs.c b/drivers/gpu/drm/tiny/bochs.c index 024346054c70..598488905607 100644 --- a/drivers/gpu/drm/tiny/bochs.c +++ b/drivers/gpu/drm/tiny/bochs.c @@ -2,6 +2,7 @@ #include <linux/module.h> #include <linux/pci.h> +#include <linux/pm.h> #include <drm/drm_aperture.h> #include <drm/drm_atomic_helper.h> @@ -610,30 +611,6 @@ static const struct drm_driver bochs_driver = { DRM_GEM_VRAM_DRIVER, }; -/* ---------------------------------------------------------------------- */ -/* pm interface */ - -#ifdef CONFIG_PM_SLEEP -static int bochs_pm_suspend(struct device *dev) -{ - struct drm_device *drm_dev = dev_get_drvdata(dev); - - return drm_mode_config_helper_suspend(drm_dev); -} - -static int bochs_pm_resume(struct device *dev) -{ - struct drm_device *drm_dev = dev_get_drvdata(dev); - - return drm_mode_config_helper_resume(drm_dev); -} -#endif - -static const struct dev_pm_ops bochs_pm_ops = { - SET_SYSTEM_SLEEP_PM_OPS(bochs_pm_suspend, - bochs_pm_resume) -}; - /* ---------------------------------------------------------------------- */ /* pci interface */ @@ -716,12 +693,14 @@ static const struct pci_device_id bochs_pci_tbl[] = { { /* end of list */ } }; +DEFINE_DRM_MODE_CONFIG_HELPER_PM_OPS(bochs_pm_ops); + static struct pci_driver bochs_pci_driver = { .name = "bochs-drm", .id_table = bochs_pci_tbl, .probe = bochs_pci_probe, .remove = bochs_pci_remove, - .driver.pm = &bochs_pm_ops, + .driver.pm = pm_sleep_ptr(&bochs_pm_ops), }; /* ---------------------------------------------------------------------- */ -- 2.35.1