Skip to content

Commit

Permalink
fbdev: sh_mobile_meram: Implement system suspend/resume
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Laurent Pinchart committed Mar 12, 2012
1 parent cdf88b9 commit af89956
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions drivers/video/sh_mobile_meram.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand All @@ -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
Expand Down

0 comments on commit af89956

Please sign in to comment.