From owner-svn-src-head@FreeBSD.ORG  Thu Jan  6 21:03:56 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BC0F9106564A;
	Thu,  6 Jan 2011 21:03:56 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 56AA18FC21;
	Thu,  6 Jan 2011 21:03:55 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p06L3tOl028286;
	Thu, 6 Jan 2011 21:03:55 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p06L3t8s028284;
	Thu, 6 Jan 2011 21:03:55 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201101062103.p06L3t8s028284@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Thu, 6 Jan 2011 21:03:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r217069 - head/sys/arm/mv
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 06 Jan 2011 21:03:56 -0000

Author: jhb
Date: Thu Jan  6 21:03:55 2011
New Revision: 217069
URL: http://svn.freebsd.org/changeset/base/217069

Log:
  - Add a proper return value to mv_gpio_intr().
  - Remove an obsolete use of INTR_FAST.

Modified:
  head/sys/arm/mv/gpio.c

Modified: head/sys/arm/mv/gpio.c
==============================================================================
--- head/sys/arm/mv/gpio.c	Thu Jan  6 21:02:14 2011	(r217068)
+++ head/sys/arm/mv/gpio.c	Thu Jan  6 21:03:55 2011	(r217069)
@@ -74,7 +74,7 @@ static uint32_t	gpio_setup[MV_GPIO_MAX_N
 
 static int	mv_gpio_probe(device_t);
 static int	mv_gpio_attach(device_t);
-static void	mv_gpio_intr(void *);
+static int	mv_gpio_intr(void *);
 
 static void	mv_gpio_intr_handler(int pin);
 static uint32_t	mv_gpio_reg_read(uint32_t reg);
@@ -193,8 +193,7 @@ mv_gpio_attach(device_t dev)
 
 	for (i = 0; i < sc->irq_num; i++) {
 		if (bus_setup_intr(dev, sc->res[1 + i],
-		    INTR_TYPE_MISC | INTR_FAST,
-		    (driver_filter_t *)mv_gpio_intr, NULL,
+		    INTR_TYPE_MISC, mv_gpio_intr, NULL,
 		    sc, &sc->ih_cookie[i]) != 0) {
 			bus_release_resources(dev, mv_gpio_res, sc->res);
 			device_printf(dev, "could not set up intr %d\n", i);
@@ -208,7 +207,7 @@ mv_gpio_attach(device_t dev)
 	return (0);
 }
 
-static void
+static int
 mv_gpio_intr(void *arg)
 {
 	uint32_t int_cause, gpio_val;
@@ -241,6 +240,8 @@ mv_gpio_intr(void *arg)
 			i++;
 		}
 	}
+
+	return (FILTER_HANDLED);
 }
 
 /*