Patchwork [-next] gianfar: Fix build with CONFIG_PM enabled

login
register
mail settings
Submitter Anton Vorontsov
Date March 19, 2009, 3:12 p.m.
Message ID <20090319151217.GA11465@oksana.dev.rtsoft.ru>
Download mbox | patch
Permalink /patch/24686/
State Accepted, archived
Headers show

Comments

Anton Vorontsov - March 19, 2009, 3:12 p.m.
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(-)
Kumar Gala - March 19, 2009, 3:16 p.m.
On Mar 19, 2009, at 10:12 AM, Anton Vorontsov wrote:

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

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

- k
David Miller - March 21, 2009, 8:28 p.m.
From: Kumar Gala <galak@kernel.crashing.org>
Date: Thu, 19 Mar 2009 10:16:26 -0500

> 
> On Mar 19, 2009, at 10:12 AM, Anton Vorontsov wrote:
> 
> > commit 4826857f1bf07f9c0f1495e9b05d125552c88a85 ("gianfar: pass the
> > proper dev to DMA ops") introduced this build breakage:
...
> > Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
> 
> Acked-by: Kumar Gala <galak@kernel.crashing.org>

Applied, thanks.

Patch

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