* [PATCH] fec: convert legacy PM hooks to dem_pm_ops
@ 2010-06-02 19:27 Denis Kirjanov
2010-06-05 9:55 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Denis Kirjanov @ 2010-06-02 19:27 UTC (permalink / raw)
To: davem; +Cc: s.hauer, eric, gerg, linux-arm-kernel, netdev
This patch compile tested only.
Convert legacy PM hooks to dev_pm_ops
Signed-off-by: Denis Kirjanov <dkirjanov@kernel.org>
---
drivers/net/fec.c | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/drivers/net/fec.c b/drivers/net/fec.c
index 42d9ac9..6990791 100644
--- a/drivers/net/fec.c
+++ b/drivers/net/fec.c
@@ -1339,6 +1339,8 @@ fec_drv_remove(struct platform_device *pdev)
return 0;
}
+#ifdef CONFIG_PM
+
static int
fec_suspend(struct platform_device *dev, pm_message_t state)
{
@@ -1369,15 +1371,31 @@ fec_resume(struct platform_device *dev)
return 0;
}
+static const struct dev_pm_ops fec_pm_ops = {
+ .suspend = fec_suspend,
+ .resume = fec_resume,
+ .freeze = fec_suspend,
+ .thaw = fec_resume,
+ .poweroff = fec_suspend,
+ .restore = fec_resume,
+};
+
+#define FEC_PM_OPS (&fec_pm_ops)
+
+#else /* !CONFIG_PM */
+
+#define FEC_PM_OPS NULL
+
+#endif /* !CONFIG_PM */
+
static struct platform_driver fec_driver = {
.driver = {
.name = "fec",
.owner = THIS_MODULE,
+ .pm = FEC_PM_OPS,
},
.probe = fec_probe,
.remove = __devexit_p(fec_drv_remove),
- .suspend = fec_suspend,
- .resume = fec_resume,
};
static int __init
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] fec: convert legacy PM hooks to dem_pm_ops
2010-06-02 19:27 [PATCH] fec: convert legacy PM hooks to dem_pm_ops Denis Kirjanov
@ 2010-06-05 9:55 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2010-06-05 9:55 UTC (permalink / raw)
To: dkirjanov; +Cc: netdev, s.hauer, linux-arm-kernel, eric, gerg
From: Denis Kirjanov <dkirjanov@hera.kernel.org>
Date: Wed, 2 Jun 2010 19:27:04 +0000
> This patch compile tested only.
>
> Convert legacy PM hooks to dev_pm_ops
> Signed-off-by: Denis Kirjanov <dkirjanov@kernel.org>
Applied, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-06-05 9:55 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-06-02 19:27 [PATCH] fec: convert legacy PM hooks to dem_pm_ops Denis Kirjanov
2010-06-05 9:55 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).