gianfar: Fix build with CONFIG_PM enabled
Subsystems (2)
PATCH 1/1 gianfar: Fix build with CONFIG_PM enabled
commit 4826857f1bf07f9c0f1495e9b05d125552c88a85 ("gianfar: pass the proper dev to DMA ops") introduced this build breakage:
CC drivers/net/gianfar.odrivers/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.
--- drivers/net/gianfar.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/gianfar.c +2 -2
@@ -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 &&
Signature · 1 line
1.5.6.5
Quoted 10 lines · Anton Vorontsov
commit
4826857f1bf07f9c0f1495e9b05d125552c88a85("gianfar: pass the proper dev to DMA ops") introduced this build breakage:CC
drivers/net/gianfar.odrivers/net/gianfar.c: In function 'gfar_suspend':drivers/net/gianfar.c:552: error: 'structgfar_private' has no member named 'dev'drivers/net/gianfar.c: In function 'gfar_resume':drivers/net/gianfar.c:601: error: 'structgfar_private' has no member named 'dev' make[2]: *** [drivers/net/gianfar.o] Error 1
Quoted 7 lines
Fix this by converting suspend and resume routines to use
gfar_private->ndev.Signed-off-by Anton Vorontsov <[email protected]>---
drivers/net/gianfar.c| 4 ++--1 files changed, 2 insertions(+), 2 deletions(-)
- k
From: Kumar Gala <[email protected]>
Date: Thu, 19 Mar 2009 10:16:26 -0500
Quoted 5 lines · Anton Vorontsov
Quoted 3 lines
commit
4826857f1bf07f9c0f1495e9b05d125552c88a85("gianfar: pass the proper dev to DMA ops") introduced this build breakage:
...
Quoted 3 lines
Quoted 1 line
Signed-off-by Anton Vorontsov <[email protected]>Acked-by Kumar Gala <[email protected]>
Applied, thanks.