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
This commit is contained in:
emaste 2009-10-29 14:53:45 +00:00
parent a617f964fc
commit c847bcb8bb
2 changed files with 8 additions and 12 deletions

View File

@ -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);

View File

@ -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);