Skip to contentSkip to conversation

net/fec: clean suspend/resume

PATCH New Eric Bénard 2 participants 4 messages Jun 18, 2010 – Jun 26, 2010 Network drivers

lore
Share & tools
lore

Eric Bénard

author
#0 lore raw

PATCH 1/2 net/fec: clean suspend/resume

Commit 59d4289b83b11379d867e2f7146904b19cc96404 converted fec to dev_pm_ops but didn't update the suspend/resume functions thus leading to the following warning :
"initialization from incompatible pointer type" when CONFIG_PM is set.

This patch also fixe a few indentation and style around CONFIG_PM area.

Signed-off-by Eric B?nard <[email protected]>

To: netdev at vger.kernel.org
Cc: davem at davemloft.net
Cc: amit.kucheria at canonical.com
Cc: s.hauer at pengutronix.de
Cc: linux-arm-kernel at lists.infradead.org

---
 drivers/net/fec.c |   30 ++++++++++++------------------
 1 files changed, 12 insertions(+), 18 deletions(-)
drivers/net/fec.c +12 -18
index a3cae4e..b4afd7a 100644
@@ -1360,11 +1360,10 @@ fec_drv_remove(struct platform_device *pdev)
 }
 
 #ifdef CONFIG_PM
-
 static int
-fec_suspend(struct platform_device *dev, pm_message_t state)
+fec_suspend(struct device *dev)
 {
-	struct net_device *ndev = platform_get_drvdata(dev);
+	struct net_device *ndev = dev_get_drvdata(dev);
 	struct fec_enet_private *fep;
 
 	if (ndev) {

@@ -1377,9 +1376,9 @@ fec_suspend(struct platform_device *dev, pm_message_t state)
 }
 
 static int
-fec_resume(struct platform_device *dev)
+fec_resume(struct device *dev)
 {
-	struct net_device *ndev = platform_get_drvdata(dev);
+	struct net_device *ndev = dev_get_drvdata(dev);
 	struct fec_enet_private *fep;
 
 	if (ndev) {

@@ -1399,23 +1398,18 @@ static const struct dev_pm_ops fec_pm_ops = {
 	.poweroff	= fec_suspend,
 	.restore	= fec_resume,
 };
-
-#define FEC_PM_OPS (&fec_pm_ops)
-
-#else /* !CONFIG_PM */
-
-#define FEC_PM_OPS NULL
-
-#endif /* !CONFIG_PM */
+#endif
 
 static struct platform_driver fec_driver = {
 	.driver	= {
-		.name    = "fec",
-		.owner	 = THIS_MODULE,
-		.pm		 = FEC_PM_OPS,
+		.name	= "fec",
+		.owner	= THIS_MODULE,
+#ifdef CONFIG_PM
+		.pm	= &fec_pm_ops,
+#endif
 	},
-	.probe   = fec_probe,
-	.remove  = __devexit_p(fec_drv_remove),
+	.probe	= fec_probe,
+	.remove	= __devexit_p(fec_drv_remove),
 };
 
 static int __init
Signature · 1 line
1.6.3.3
maintainer
#1 lore raw

PATCH 1/2 net/fec: clean suspend/resume

From: Eric B?nard <[email protected]>
Date: Fri, 18 Jun 2010 11:29:10 +0200

Quoted 7 lines

Commit 59d4289b83b11379d867e2f7146904b19cc96404 converted fec to dev_pm_ops but didn't update the suspend/resume functions thus leading to the following warning :
"initialization from incompatible pointer type" when CONFIG_PM is set.

This patch also fixe a few indentation and style around CONFIG_PM area.

Signed-off-by Eric B?nard <[email protected]>

So, where's patch 2/2?

author
#2 lore raw

PATCH 1/2 net/fec: clean suspend/resume

Le 25/06/2010 07:05, David Miller a ?crit :

Quoted 7 lines

From: Eric B?nard<[email protected]>
Date: Fri, 18 Jun 2010 11:29:10 +0200

Quoted 4 lines

Commit 59d4289b83b11379d867e2f7146904b19cc96404 converted fec to dev_pm_ops but didn't update the suspend/resume functions thus leading to the following warning :
"initialization from incompatible pointer type" when CONFIG_PM is set.

Quoted 6 lines
Quoted 3 lines

This patch also fixe a few indentation and style around CONFIG_PM area.

Signed-off-by Eric B?nard<[email protected]>

So, where's patch 2/2?

Sorry, there is no patch 2/2 for netdev, the 2/2 was only for linux-arm-kernel :
http://lists.infradead.org/pipermail/linux-arm-kernel/2010-June/018387.html

Eric

maintainer Applied
#3 lore raw

PATCH 1/2 net/fec: clean suspend/resume

In reply to Eric Bénard

From: Eric B?nard <[email protected]>
Date: Fri, 18 Jun 2010 11:29:10 +0200

Quoted 7 lines

Commit 59d4289b83b11379d867e2f7146904b19cc96404 converted fec to dev_pm_ops but didn't update the suspend/resume functions thus leading to the following warning :
"initialization from incompatible pointer type" when CONFIG_PM is set.

This patch also fixe a few indentation and style around CONFIG_PM area.

Signed-off-by Eric B?nard <[email protected]>

Applied.