Patchwork fix a warning on drivers/net/via-velocity.c

login
register
mail settings
Submitter Zhenwen Xu
Date April 10, 2009, 1:11 p.m.
Message ID <20090410131157.GA10063@helight>
Download mbox | patch
Permalink /patch/25832/
State Not Applicable
Delegated to: David Miller
Headers show

Comments

Zhenwen Xu - April 10, 2009, 1:11 p.m.
fix this waring:

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


From daa9a8764a7a4261597a6b75230b9029d7723336 Mon Sep 17 00:00:00 2001
From: Zhenwen Xu <Helight.Xu@gmail.com>
Date: Fri, 10 Apr 2009 21:06:39 +0800
Subject: [PATCH] fix a warning on drivers/net/via-velocity.c

Signed-off-by: Zhenwen Xu <helight.xu@gmail.com>
---
 drivers/net/via-velocity.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Patch

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);