diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2011-11-22 00:56:58 +0100 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2012-03-12 22:41:14 +0100 |
| commit | af89956be14ae5bb304872756a47309edc2c94fb (patch) | |
| tree | 45f46471872fd17efd3228b7a33da53410141fa4 /drivers/video/sh_mobile_meram.c | |
| parent | fbdev: sh_mobile_meram: Remove unneeded sanity checks (diff) | |
| download | linux-af89956be14ae5bb304872756a47309edc2c94fb.tar.xz linux-af89956be14ae5bb304872756a47309edc2c94fb.zip | |
fbdev: sh_mobile_meram: Implement system suspend/resume
Supporting runtime PM is very nice, but that's not a reason not to
implement system suspend/resume properly.
Reported-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Diffstat (limited to 'drivers/video/sh_mobile_meram.c')
| -rw-r--r-- | drivers/video/sh_mobile_meram.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/video/sh_mobile_meram.c b/drivers/video/sh_mobile_meram.c index d9f7a44c231c..82ba830bf95d 100644 --- a/drivers/video/sh_mobile_meram.c +++ b/drivers/video/sh_mobile_meram.c @@ -539,7 +539,7 @@ static struct sh_mobile_meram_ops sh_mobile_meram_ops = { * Power management */ -static int sh_mobile_meram_runtime_suspend(struct device *dev) +static int sh_mobile_meram_suspend(struct device *dev) { struct platform_device *pdev = to_platform_device(dev); struct sh_mobile_meram_priv *priv = platform_get_drvdata(pdev); @@ -563,7 +563,7 @@ static int sh_mobile_meram_runtime_suspend(struct device *dev) return 0; } -static int sh_mobile_meram_runtime_resume(struct device *dev) +static int sh_mobile_meram_resume(struct device *dev) { struct platform_device *pdev = to_platform_device(dev); struct sh_mobile_meram_priv *priv = platform_get_drvdata(pdev); @@ -582,10 +582,9 @@ static int sh_mobile_meram_runtime_resume(struct device *dev) return 0; } -static const struct dev_pm_ops sh_mobile_meram_dev_pm_ops = { - .runtime_suspend = sh_mobile_meram_runtime_suspend, - .runtime_resume = sh_mobile_meram_runtime_resume, -}; +static UNIVERSAL_DEV_PM_OPS(sh_mobile_meram_dev_pm_ops, + sh_mobile_meram_suspend, + sh_mobile_meram_resume, NULL); /* ----------------------------------------------------------------------------- * Probe/remove and driver init/exit |