[PATCH v2] sh-sci: extend PM methods
From: Sergei Shtylyov <hidden>
Date: 2015-01-19 22:41:48
Also in:
linux-sh
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|resume}() 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 original patch by Mikhail Ulyanov [off-list ref].
Signed-off-by: Sergei Shtylyov <redacted>
---
This patch is against the 'tty-next' branch of GregKH's 'tty.git' repo.
Changes in version 2:
- fixed typos and too long line in the changelog.
drivers/tty/serial/sh-sci.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
Index: tty/drivers/tty/serial/sh-sci.c
===================================================================--- tty.orig/drivers/tty/serial/sh-sci.c
+++ tty/drivers/tty/serial/sh-sci.c@@ -2605,7 +2605,7 @@ static int sci_probe(struct platform_dev 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);
@@ -2615,7 +2615,7 @@ static int sci_suspend(struct device *de 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);
@@ -2625,10 +2625,7 @@ static int sci_resume(struct device *dev return 0; } -static const struct dev_pm_ops sci_dev_pm_ops = { - .suspend = sci_suspend, - .resume = sci_resume, -}; +static SIMPLE_DEV_PM_OPS(sci_dev_pm_ops, sci_suspend, sci_resume); static struct platform_driver sci_driver = { .probe = sci_probe,