Commit 29ded5f7 authored Mar 21, 2009 by Anton Vorontsov Committed by David S. Miller Mar 21, 2009

gianfar: Fix build with CONFIG_PM enabled



commit 4826857f ("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>

parent b55de80e

drivers/net/gianfar.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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 &&

Admin message