Home » Mailing list archives » linux-netdev » 2010 » June » 2

[PATCH] fec: convert legacy PM hooks to dem_pm_ops

Previous thread: [PATCH 2/2] fec: Cleanup PHY probing by Denis Kirjanov on Wednesday, June 2, 2010 - 12:17 pm. (2 messages)

Next thread: [PATCH] epic100: Test __BIG_ENDIAN instead of (non-existent) CONFIG_BIG_ENDIAN by Roland Dreier on Wednesday, June 2, 2010 - 1:36 pm. (3 messages)
[view original message]
From: Denis Kirjanov
Subject: [PATCH] fec: convert legacy PM hooks to dem_pm_ops
Date: Wednesday, June 2, 2010 - 12:27 pm

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
--


[ message continues ]
[view original message]
From: David Miller
Subject: Re: [PATCH] fec: convert legacy PM hooks to dem_pm_ops
Date: Saturday, June 5, 2010 - 2:55 am

From: Denis Kirjanov <dkirjanov@hera.kernel.org>

Applied, thanks.
--


[ message continues ]
Previous thread: [PATCH 2/2] fec: Cleanup PHY probing by Denis Kirjanov on Wednesday, June 2, 2010 - 12:17 pm. (2 messages)

Next thread: [PATCH] epic100: Test __BIG_ENDIAN instead of (non-existent) CONFIG_BIG_ENDIAN by Roland Dreier on Wednesday, June 2, 2010 - 1:36 pm. (3 messages)