summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2011-01-06 21:03:55 +0000
committerjhb <jhb@FreeBSD.org>2011-01-06 21:03:55 +0000
commit7ac38a901b025af63aed1b72791e3adbd2f51034 (patch)
tree68228367089b2ec7c992e4cbdccf9a9cbd2aa464
parentb70a854e08ede8adfbb43e57884d17a65da50bf4 (diff)
downloadFreeBSD-src-7ac38a901b025af63aed1b72791e3adbd2f51034.zip
FreeBSD-src-7ac38a901b025af63aed1b72791e3adbd2f51034.tar.gz
- Add a proper return value to mv_gpio_intr().
- Remove an obsolete use of INTR_FAST.
-rw-r--r--sys/arm/mv/gpio.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/arm/mv/gpio.c b/sys/arm/mv/gpio.c
index 3d2d582..566c147 100644
--- a/sys/arm/mv/gpio.c
+++ b/sys/arm/mv/gpio.c
@@ -74,7 +74,7 @@ static uint32_t gpio_setup[MV_GPIO_MAX_NPINS];
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);
}
/*
OpenPOWER on IntegriCloud