From patchwork Fri Apr 10 13:11:57 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Zhenwen Xu X-Patchwork-Id: 25832 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 6096ADE1E0 for ; Fri, 10 Apr 2009 23:13:28 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932857AbZDJNNW (ORCPT ); Fri, 10 Apr 2009 09:13:22 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1761196AbZDJNNV (ORCPT ); Fri, 10 Apr 2009 09:13:21 -0400 Received: from ti-out-0910.google.com ([209.85.142.190]:16922 "EHLO ti-out-0910.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756796AbZDJNNU (ORCPT ); Fri, 10 Apr 2009 09:13:20 -0400 Received: by ti-out-0910.google.com with SMTP id i7so869386tid.23 for ; Fri, 10 Apr 2009 06:13:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:reply-to:mime-version:content-type:content-disposition :content-transfer-encoding:user-agent; bh=+5Wd+jh27gNF6gc78+Xx+Kw43aG8MWT2M6o4TjhcK00=; b=G8HtduqueJ4sluFTifUWmLRS0PrhiBqr821zL1K/HI2/ETse3Wi0arQzRZb4INmRnB NH6hrkWDXRbBavhp9rai2Hn6eiznjkeicmcQqyhY0l5k3pNThOmBR3f4qkgKb13+9Dsh wepH81MU3dfaz4GobeOT0WLeR2Q0PayPRUP6Y= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:reply-to:mime-version :content-type:content-disposition:content-transfer-encoding :user-agent; b=vJze3l9zYuePN+oEWCSN4bCgei4Qm6Api4hVqs1TDXuXucA9I/KMia3iTHjUlOJ4Ft kdpdqmUNn2eTzBGnbRGc5oJOI9dSDYQnSLeOh83uCbpdAPbkYAqca7ZzcUPuIgBUqNsX F0PLt2Uq/5MoqoWSsZAI+SaQDSWu4vvCbKUlE= Received: by 10.110.84.7 with SMTP id h7mr4839768tib.59.1239369198519; Fri, 10 Apr 2009 06:13:18 -0700 (PDT) Received: from localhost ([221.11.22.40]) by mx.google.com with ESMTPS id a14sm761862tia.27.2009.04.10.06.13.16 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 10 Apr 2009 06:13:17 -0700 (PDT) Date: Fri, 10 Apr 2009 21:11:57 +0800 From: Zhenwen Xu To: linux-kernel@vger.kernel.org Cc: romieu@fr.zoreil.com, netdev@vger.kernel.org Subject: [PATCH]fix a warning on drivers/net/via-velocity.c Message-ID: <20090410131157.GA10063@helight> Reply-To: Zhenwen Xu MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 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 --- 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);