Commit 74f481f1 authored by Hans de Goede's avatar Hans de Goede

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: default avatarHans de Goede <hdegoede@redhat.com>
Acked-by: default avatarPatrik Jakobsson <patrik.r.jakobsson@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220909115646.99920-7-hdegoede@redhat.com
parent 672c4735
...@@ -230,28 +230,3 @@ void gma_power_end(struct drm_device *dev) ...@@ -230,28 +230,3 @@ void gma_power_end(struct drm_device *dev)
{ {
pm_runtime_put(dev->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);
}
...@@ -43,9 +43,6 @@ void gma_power_uninit(struct drm_device *dev); ...@@ -43,9 +43,6 @@ void gma_power_uninit(struct drm_device *dev);
*/ */
int gma_power_suspend(struct device *dev); int gma_power_suspend(struct device *dev);
int gma_power_resume(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 * These are the functions the driver should use to wrap all hw access
...@@ -54,10 +51,4 @@ int gma_power_restore(struct device *_dev); ...@@ -54,10 +51,4 @@ int gma_power_restore(struct device *_dev);
bool gma_power_begin(struct drm_device *dev, bool force); bool gma_power_begin(struct drm_device *dev, bool force);
void gma_power_end(struct drm_device *dev); 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_*/ #endif /*_PSB_POWERMGMT_H_*/
...@@ -471,15 +471,7 @@ static void psb_pci_remove(struct pci_dev *pdev) ...@@ -471,15 +471,7 @@ static void psb_pci_remove(struct pci_dev *pdev)
drm_dev_unregister(dev); drm_dev_unregister(dev);
} }
static const struct dev_pm_ops psb_pm_ops = { static DEFINE_RUNTIME_DEV_PM_OPS(psb_pm_ops, gma_power_suspend, gma_power_resume, NULL);
.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 const struct file_operations psb_gem_fops = { static const struct file_operations psb_gem_fops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
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