leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sh-sci: extend PM methods

Browse Source 
In order to make it possible to restore from hibernation not only in Linux but
also in e.g. U-Boot, we have to use sci_{suspend|remove}() for the PM {freeze|
thaw|restore}() methods.  It's handy to achieve this by using SIMPLE_DEV_PM_OPS()
macro, however we have to annotate sci_{suspend|remove}() with '__maybe_unused'
in order to avoid compilation warnings when CONFIG_PM_SLEEP is undefined.

Based on orignal patch by Mikhail Ulyanov <mikhail.ulyanov@cogentembedded.com>.

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Sergei Shtylyov
2015-01-16 13:56:02 -08:00
committed by Greg Kroah-Hartman
parent c81622ac42
commit cb87634172
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/tty/serial/sh-sci.c
View File

@@ -2605,7 +2605,7 @@ static int sci_probe(struct platform_device *dev)
return 0; return 0;
} }
static int sci_suspend(struct device *dev) static __maybe_unused int sci_suspend(struct device *dev)
{ {
struct sci_port *sport = dev_get_drvdata(dev); struct sci_port *sport = dev_get_drvdata(dev);
@@ -2615,7 +2615,7 @@ static int sci_suspend(struct device *dev)
return 0; return 0;
} }
static int sci_resume(struct device *dev) static __maybe_unused int sci_resume(struct device *dev)
{ {
struct sci_port *sport = dev_get_drvdata(dev); struct sci_port *sport = dev_get_drvdata(dev);
@@ -2625,10 +2625,7 @@ static int sci_resume(struct device *dev)
return 0; return 0;
} }
static const struct dev_pm_ops sci_dev_pm_ops = { static SIMPLE_DEV_PM_OPS(sci_dev_pm_ops, sci_suspend, sci_resume);
.suspend = sci_suspend,
.resume = sci_resume,
};
static struct platform_driver sci_driver = { static struct platform_driver sci_driver = {
.probe = sci_probe, .probe = sci_probe,