Skip to contentSkip to conversation

fec: convert legacy PM hooks to dem_pm_ops

PATCH Applied Denis Kirjanov 2 participants 2 messages Jun 2, 2010 – Jun 5, 2010

Subsystems (2)
Networking Network drivers
lore
Share & tools
lore

Denis Kirjanov

author
#0 lore raw

PATCH 1/1 fec: convert legacy PM hooks to dem_pm_ops

This patch compile tested only.

Convert legacy PM hooks to dev_pm_ops

Signed-off-by Denis Kirjanov <[email protected]>

---
drivers/net/fec.c | 24 +++++++++++++++++++++---

 1 files changed, 21 insertions(+), 3 deletions(-)
drivers/net/fec.c +20 -2
index 42d9ac9..6990791 100644
@@ -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