[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20090414155325.27548.90325.stgit@warthog.procyon.org.uk>
Date: Tue, 14 Apr 2009 16:53:25 +0100
From: David Howells <dhowells@...hat.com>
To: romieu@...zoreil.com, netdev@...r.kernel.org
Cc: dhowells@...hat.com, akpm@...ux-foundation.org,
linux-kernel@...r.kernel.org
Subject: [PATCH] Fix velocity_intr() in the VIA Velocity driver to have the
right return type
Fix velocity_intr() in the VIA Velocity driver to have the right return type.
As it stands, it returns the right values, but as type int, not type
irqreturn_t. This leads to the following compiler warning:
CC drivers/net/via-velocity.o
drivers/net/via-velocity.c: In function 'velocity_open':
drivers/net/via-velocity.c:1924: warning: passing argument 2 of 'request_irq' from incompatible pointer type
Signed-off-by: David Howells <dhowells@...hat.com>
---
drivers/net/via-velocity.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c
index fb53ef8..754a4b1 100644
--- a/drivers/net/via-velocity.c
+++ b/drivers/net/via-velocity.c
@@ -377,7 +377,7 @@ static void velocity_print_info(struct velocity_info *vptr);
static int velocity_open(struct net_device *dev);
static int velocity_change_mtu(struct net_device *dev, int mtu);
static int velocity_xmit(struct sk_buff *skb, struct net_device *dev);
-static int velocity_intr(int irq, void *dev_instance);
+static irqreturn_t velocity_intr(int irq, void *dev_instance);
static void velocity_set_multi(struct net_device *dev);
static struct net_device_stats *velocity_get_stats(struct net_device *dev);
static int velocity_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
@@ -2215,7 +2215,7 @@ out:
* efficiently as possible.
*/
-static int velocity_intr(int irq, void *dev_instance)
+static irqreturn_t velocity_intr(int irq, void *dev_instance)
{
struct net_device *dev = dev_instance;
struct velocity_info *vptr = netdev_priv(dev);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists