Convert drivers/gpu/drm class to use dev_pm_ops for power management and remove Legacy PM ops hooks. With this change, drm class registers suspend/resume callbacks via class->pm (dev_pm_ops) instead of Legacy class->suspend/resume. When __device_suspend() runs call-backs, it will find class->pm ops for the drm class.

Signed-off-by: Shuah Khan shuah.kh@samsung.com --- drivers/gpu/drm/drm_sysfs.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c index 0229665..8d94778 100644 --- a/drivers/gpu/drm/drm_sysfs.c +++ b/drivers/gpu/drm/drm_sysfs.c @@ -37,7 +37,7 @@ static struct device_type drm_sysfs_device_minor = { * Just figures out what the actual struct drm_device associated with * @dev is and calls its suspend hook, if present. */ -static int drm_class_suspend(struct device *dev, pm_message_t state) +static int drm_class_suspend(struct device *dev) { if (dev->type == &drm_sysfs_device_minor) { struct drm_minor *drm_minor = to_drm_minor(dev); @@ -46,7 +46,8 @@ static int drm_class_suspend(struct device *dev, pm_message_t state) if (drm_minor->type == DRM_MINOR_LEGACY && !drm_core_check_feature(drm_dev, DRIVER_MODESET) && drm_dev->driver->suspend) - return drm_dev->driver->suspend(drm_dev, state); + return drm_dev->driver->suspend(drm_dev, + get_pm_transition()); } return 0; } @@ -72,6 +73,11 @@ static int drm_class_resume(struct device *dev) return 0; }

+static const struct dev_pm_ops drm_class_dev_pm_ops = { + .suspend = drm_class_suspend, + .resume = drm_class_resume, +}; + static char *drm_devnode(struct device *dev, umode_t *mode) { return kasprintf(GFP_KERNEL, "dri/%s", dev_name(dev)); @@ -106,8 +112,7 @@ struct class *drm_sysfs_create(struct module *owner, char *name) goto err_out; }

- class->suspend = drm_class_suspend; - class->resume = drm_class_resume; + class->pm = &drm_class_dev_pm_ops;

err = class_create_file(class, &class_attr_version.attr); if (err)