From af89956be14ae5bb304872756a47309edc2c94fb Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Tue, 22 Nov 2011 00:56:58 +0100 Subject: [PATCH] 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 Signed-off-by: Laurent Pinchart --- drivers/video/sh_mobile_meram.c | 11 +++++------ 1 file 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