Re: [PATCH -next] gianfar: Fix build with CONFIG_PM enabled

Previous thread: [PATCH] remove duplicated #include by Huang Weiyi on Thursday, March 19, 2009 - 6:44 am. (2 messages)

Next thread: **Winning Notification** by Tobacco News Centre on Thursday, March 19, 2009 - 8:31 am. (1 message)
From: Anton Vorontsov
Date: Thursday, March 19, 2009 - 8:12 am

commit 4826857f1bf07f9c0f1495e9b05d125552c88a85 ("gianfar: pass the
proper dev to DMA ops") introduced this build breakage:

  CC      drivers/net/gianfar.o
drivers/net/gianfar.c: In function 'gfar_suspend':
drivers/net/gianfar.c:552: error: 'struct gfar_private' has no member named 'dev'
drivers/net/gianfar.c: In function 'gfar_resume':
drivers/net/gianfar.c:601: error: 'struct gfar_private' has no member named 'dev'
make[2]: *** [drivers/net/gianfar.o] Error 1

Fix this by converting suspend and resume routines to use
gfar_private->ndev.

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
---
 drivers/net/gianfar.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index 8659833..8a51df0 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -549,7 +549,7 @@ static int gfar_remove(struct of_device *ofdev)
 static int gfar_suspend(struct of_device *ofdev, pm_message_t state)
 {
 	struct gfar_private *priv = dev_get_drvdata(&ofdev->dev);
-	struct net_device *dev = priv->dev;
+	struct net_device *dev = priv->ndev;
 	unsigned long flags;
 	u32 tempval;
 
@@ -598,7 +598,7 @@ static int gfar_suspend(struct of_device *ofdev, pm_message_t state)
 static int gfar_resume(struct of_device *ofdev)
 {
 	struct gfar_private *priv = dev_get_drvdata(&ofdev->dev);
-	struct net_device *dev = priv->dev;
+	struct net_device *dev = priv->ndev;
 	unsigned long flags;
 	u32 tempval;
 	int magic_packet = priv->wol_en &&
-- 
1.5.6.5
--

From: Kumar Gala
Date: Thursday, March 19, 2009 - 8:16 am

Acked-by: Kumar Gala <galak@kernel.crashing.org>

- k
--

From: David Miller
Date: Saturday, March 21, 2009 - 1:28 pm

From: Kumar Gala <galak@kernel.crashing.org>

Applied, thanks.
--

Previous thread: [PATCH] remove duplicated #include by Huang Weiyi on Thursday, March 19, 2009 - 6:44 am. (2 messages)

Next thread: **Winning Notification** by Tobacco News Centre on Thursday, March 19, 2009 - 8:31 am. (1 message)