]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
gianfar: Fix build with CONFIG_PM enabled
authorAnton Vorontsov <avorontsov@ru.mvista.com>
Sat, 21 Mar 2009 20:27:55 +0000 (13:27 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 21 Mar 2009 20:27:55 +0000 (13:27 -0700)
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>
Acked-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/gianfar.c

index 8659833f28eb9c31ac2aab57279f49054cefc81b..8a51df045e84a3564548236028decdbdba31ea26 100644 (file)
@@ -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 &&