[PATCH 1/1] DaVinci EMAC: correct param for ISR

[PATCH 1/1] DaVinci EMAC: correct param for ISR

[Tonyliu]

[-- Attachment #1: Type: text/plain, Size: 1 bytes --]



[-- Attachment #2: 0001-DaVinci-EMAC-correct-param-for-ISR.patch --]
[-- Type: text/x-patch, Size: 1050 bytes --]

>From bf855d3a1f824ab87933a64c9fc93f859b064e92 Mon Sep 17 00:00:00 2001
From: Tonyliu <Bo.Liu@windriver.com>
Date: Wed, 28 Oct 2009 11:06:48 +0800
Subject: [PATCH 1/1] DaVinci EMAC: correct param for ISR

emac_irq is declared as:

static irqreturn_t emac_irq(int irq, void *dev_id)
{
       struct net_device *ndev = (struct net_device *)dev_id;
       struct emac_priv *priv = netdev_priv(ndev);
    ... 

	Clearly emac_irq() needs "struct net_device *" as "void *dev_id", so correct this.

Signed-off-by: Tonyliu <Bo.Liu@windriver.com>
---
 drivers/net/davinci_emac.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c
index a876dce..4cf80ec 100644
--- a/drivers/net/davinci_emac.c
+++ b/drivers/net/davinci_emac.c
@@ -2217,7 +2217,7 @@ void emac_poll_controller(struct net_device *ndev)
 	struct emac_priv *priv = netdev_priv(ndev);
 
 	emac_int_disable(priv);
-	emac_irq(ndev->irq, priv);
+	emac_irq(ndev->irq, ndev);
 	emac_int_enable(priv);
 }
 #endif
-- 
1.5.5.4

Re: [PATCH 1/1] DaVinci EMAC: correct param for ISR

[David Miller]

From: Tonyliu <Bo.Liu@windriver.com>
Date: Tue, 03 Nov 2009 09:52:22 +0800

> Subject: [PATCH 1/1] DaVinci EMAC: correct param for ISR
> 
> emac_irq is declared as:
> 
> static irqreturn_t emac_irq(int irq, void *dev_id)
> {
>        struct net_device *ndev = (struct net_device *)dev_id;
>        struct emac_priv *priv = netdev_priv(ndev);
>     ... 
> 
> 	Clearly emac_irq() needs "struct net_device *" as "void *dev_id", so correct this.
> 
> Signed-off-by: Tonyliu <Bo.Liu@windriver.com>

Applied to net-2.6, thank you.