drm/gma500: Remove unnecessary suspend/resume wrappers

The psb_runtime_suspend/resume/thaw/freeze/restore functions are all
just 1:1 wrappers around gma_power_suspend/_resume.

Drop these wrappers and use the DEFINE_RUNTIME_DEV_PM_OPS() macro to
define the dev_pm_ops struct.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220909115646.99920-7-hdegoede@redhat.com

diff --git a/drivers/gpu/drm/gma500/power.c b/drivers/gpu/drm/gma500/power.c
index af09e0d680d945fe4d6e4593d9459ab48bb1e725..186af29bea6fb80ad86bb6a2321fc9378ebfccad 100644 (file)
--- a/drivers/gpu/drm/gma500/power.c
+++ b/drivers/gpu/drm/gma500/power.c
@@ -230,28 +230,3 @@ void gma_power_end(struct drm_device *dev)
 {
        pm_runtime_put(dev->dev);
 }
-
-int psb_runtime_suspend(struct device *dev)
-{
-       return gma_power_suspend(dev);
-}
-
-int psb_runtime_resume(struct device *dev)
-{
-       return gma_power_resume(dev);
-}
-
-int gma_power_thaw(struct device *_dev)
-{
-       return gma_power_resume(_dev);
-}
-
-int gma_power_freeze(struct device *_dev)
-{
-       return gma_power_suspend(_dev);
-}
-
-int gma_power_restore(struct device *_dev)
-{
-       return gma_power_resume(_dev);
-}

diff --git a/drivers/gpu/drm/gma500/power.h b/drivers/gpu/drm/gma500/power.h
index 243b9dd0091041e6b2f4fdf09776b9d1aeca2e9a..063328d66652c63b653a5a10fa4bff89a92eaa30 100644 (file)
--- a/drivers/gpu/drm/gma500/power.h
+++ b/drivers/gpu/drm/gma500/power.h
@@ -43,9 +43,6 @@ void gma_power_uninit(struct drm_device *dev);
  */
 int gma_power_suspend(struct device *dev);
 int gma_power_resume(struct device *dev);
-int gma_power_thaw(struct device *dev);
-int gma_power_freeze(struct device *dev);
-int gma_power_restore(struct device *_dev);
 
 /*
  * These are the functions the driver should use to wrap all hw access
@@ -54,10 +51,4 @@ int gma_power_restore(struct device *_dev);
 bool gma_power_begin(struct drm_device *dev, bool force);
 void gma_power_end(struct drm_device *dev);
 
-/*
- * GFX-Runtime PM callbacks
- */
-int psb_runtime_suspend(struct device *dev);
-int psb_runtime_resume(struct device *dev);
-
 #endif /*_PSB_POWERMGMT_H_*/

diff --git a/drivers/gpu/drm/gma500/psb_drv.c b/drivers/gpu/drm/gma500/psb_drv.c
index aea8876059d8d7c3cd42a30d5fa67030bf99b7c8..9168bc620628be3527ff7b36bb0015d2797f67db 100644 (file)
--- a/drivers/gpu/drm/gma500/psb_drv.c
+++ b/drivers/gpu/drm/gma500/psb_drv.c
@@ -471,15 +471,7 @@ static void psb_pci_remove(struct pci_dev *pdev)
        drm_dev_unregister(dev);
 }
 
-static const struct dev_pm_ops psb_pm_ops = {
-       .resume = gma_power_resume,
-       .suspend = gma_power_suspend,
-       .thaw = gma_power_thaw,
-       .freeze = gma_power_freeze,
-       .restore = gma_power_restore,
-       .runtime_suspend = psb_runtime_suspend,
-       .runtime_resume = psb_runtime_resume,
-};
+static DEFINE_RUNTIME_DEV_PM_OPS(psb_pm_ops, gma_power_suspend, gma_power_resume, NULL);
 
 static const struct file_operations psb_gem_fops = {
        .owner = THIS_MODULE,