svn commit: r217069 - head/sys/arm/mv

[John Baldwin]

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);
 }
 
 /*