diff options
author | emaste <emaste@FreeBSD.org> | 2009-10-29 14:53:45 +0000 |
---|---|---|
committer | emaste <emaste@FreeBSD.org> | 2009-10-29 14:53:45 +0000 |
commit | c847bcb8bb5d6404d7251c0af15a09eed33b317f (patch) | |
tree | b49b4592ea5123b4a1baeae85379752f92b3b8c0 | |
parent | a617f964fc382eab76c4898c5ddaf96b976bc1af (diff) | |
download | FreeBSD-src-c847bcb8bb5d6404d7251c0af15a09eed33b317f.zip FreeBSD-src-c847bcb8bb5d6404d7251c0af15a09eed33b317f.tar.gz |
Rename aac_fast_intr to aac_filter to reflect its current use. Eliminate
the fallback of using the filter as an interrupt handler, as it is no
longer needed.
Discussed with: scottl, jhb
-rw-r--r-- | sys/dev/aac/aac.c | 18 | ||||
-rw-r--r-- | sys/dev/aac/aacvar.h | 2 |
2 files changed, 8 insertions, 12 deletions
diff --git a/sys/dev/aac/aac.c b/sys/dev/aac/aac.c index ded47ce..0bfb3f8 100644 --- a/sys/dev/aac/aac.c +++ b/sys/dev/aac/aac.c @@ -909,8 +909,11 @@ aac_new_intr(void *arg) mtx_unlock(&sc->aac_io_lock); } +/* + * Interrupt filter for !NEW_COMM interface. + */ int -aac_fast_intr(void *arg) +aac_filter(void *arg) { struct aac_softc *sc; u_int16_t reason; @@ -2032,18 +2035,11 @@ aac_setup_intr(struct aac_softc *sc) } } else { if (bus_setup_intr(sc->aac_dev, sc->aac_irq, - INTR_TYPE_BIO, aac_fast_intr, NULL, + INTR_TYPE_BIO, aac_filter, NULL, sc, &sc->aac_intr)) { device_printf(sc->aac_dev, - "can't set up FAST interrupt\n"); - if (bus_setup_intr(sc->aac_dev, sc->aac_irq, - INTR_MPSAFE|INTR_TYPE_BIO, - NULL, (driver_intr_t *)aac_fast_intr, - sc, &sc->aac_intr)) { - device_printf(sc->aac_dev, - "can't set up MPSAFE interrupt\n"); - return (EINVAL); - } + "can't set up interrupt filter\n"); + return (EINVAL); } } return (0); diff --git a/sys/dev/aac/aacvar.h b/sys/dev/aac/aacvar.h index 7f64371..18b8501 100644 --- a/sys/dev/aac/aacvar.h +++ b/sys/dev/aac/aacvar.h @@ -448,7 +448,7 @@ extern int aac_shutdown(device_t dev); extern int aac_suspend(device_t dev); extern int aac_resume(device_t dev); extern void aac_new_intr(void *arg); -extern int aac_fast_intr(void *arg); +extern int aac_filter(void *arg); extern void aac_submit_bio(struct bio *bp); extern void aac_biodone(struct bio *bp); extern void aac_startio(struct aac_softc *sc); |