* [PATCH -next] gianfar: Fix build with CONFIG_PM enabled
@ 2009-03-19 15:12 Anton Vorontsov
2009-03-19 15:16 ` Kumar Gala
0 siblings, 1 reply; 3+ messages in thread
From: Anton Vorontsov @ 2009-03-19 15:12 UTC (permalink / raw)
To: David Miller; +Cc: netdev, Andy Fleming, linuxppc-dev
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
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH -next] gianfar: Fix build with CONFIG_PM enabled
2009-03-19 15:12 [PATCH -next] gianfar: Fix build with CONFIG_PM enabled Anton Vorontsov
@ 2009-03-19 15:16 ` Kumar Gala
2009-03-21 20:28 ` David Miller
0 siblings, 1 reply; 3+ messages in thread
From: Kumar Gala @ 2009-03-19 15:16 UTC (permalink / raw)
To: Anton Vorontsov; +Cc: netdev, Andy Fleming, David Miller, linuxppc-dev
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
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH -next] gianfar: Fix build with CONFIG_PM enabled
2009-03-19 15:16 ` Kumar Gala
@ 2009-03-21 20:28 ` David Miller
0 siblings, 0 replies; 3+ messages in thread
From: David Miller @ 2009-03-21 20:28 UTC (permalink / raw)
To: galak; +Cc: netdev, afleming, linuxppc-dev
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.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-03-21 20:28 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-03-19 15:12 [PATCH -next] gianfar: Fix build with CONFIG_PM enabled Anton Vorontsov
2009-03-19 15:16 ` Kumar Gala
2009-03-21 20:28 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).