summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-07-07 11:50:57 +0900
committerPaul Mundt <lethal@linux-sh.org>2009-07-07 11:50:57 +0900
commit2dbc8a23cc2e677422f6dea991aca4e3d31ab65f (patch)
tree778e50222af0ab370473cf753eb516454516cf97
parent684dcd056178a04374c71459dbd2b18c6d958ef7 (diff)
downloadlinux-3.10-2dbc8a23cc2e677422f6dea991aca4e3d31ab65f.tar.gz
linux-3.10-2dbc8a23cc2e677422f6dea991aca4e3d31ab65f.tar.bz2
linux-3.10-2dbc8a23cc2e677422f6dea991aca4e3d31ab65f.zip
video: hitfb: Move over to dev_pm_ops.
A trivial update to move hitfb over to dev_pm_ops. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
-rw-r--r--drivers/video/hitfb.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/drivers/video/hitfb.c b/drivers/video/hitfb.c
index 3ae896d55a5..e7116a6d82d 100644
--- a/drivers/video/hitfb.c
+++ b/drivers/video/hitfb.c
@@ -429,8 +429,7 @@ static int __exit hitfb_remove(struct platform_device *dev)
return 0;
}
-#ifdef CONFIG_PM
-static int hitfb_suspend(struct platform_device *dev, pm_message_t state)
+static int hitfb_suspend(struct device *dev)
{
u16 v;
@@ -442,7 +441,7 @@ static int hitfb_suspend(struct platform_device *dev, pm_message_t state)
return 0;
}
-static int hitfb_resume(struct platform_device *dev)
+static int hitfb_resume(struct device *dev)
{
u16 v;
@@ -456,17 +455,19 @@ static int hitfb_resume(struct platform_device *dev)
return 0;
}
-#endif
+
+static struct dev_pm_ops hitfb_dev_pm_ops = {
+ .suspend = hitfb_suspend,
+ .resume = hitfb_resume,
+};
static struct platform_driver hitfb_driver = {
.probe = hitfb_probe,
.remove = __exit_p(hitfb_remove),
-#ifdef CONFIG_PM
- .suspend = hitfb_suspend,
- .resume = hitfb_resume,
-#endif
.driver = {
.name = "hitfb",
+ .owner = THIS_MODULE,
+ .pm = &hitfb_dev_pm_ops,
},
};