diff options
author | jhb <jhb@FreeBSD.org> | 2008-03-17 22:42:01 +0000 |
---|---|---|
committer | jhb <jhb@FreeBSD.org> | 2008-03-17 22:42:01 +0000 |
commit | c04bb048f627b5ef992c77aced92b491f4c8974a (patch) | |
tree | 57731c0991b2b903b93e4762f94fa493eb565f3b /sys/ia64 | |
parent | 10c89ab0d1faf7de0ab559184da2c88cbbe093fa (diff) | |
download | FreeBSD-src-c04bb048f627b5ef992c77aced92b491f4c8974a.zip FreeBSD-src-c04bb048f627b5ef992c77aced92b491f4c8974a.tar.gz |
Simplify the interrupt code a bit:
- Always include the ie_disable and ie_eoi methods in 'struct intr_event'
and collapse down to one intr_event_create() routine. The disable and
eoi hooks simply aren't used currently in the !INTR_FILTER case.
- Expand 'disab' to 'disable' in a few places.
- Use function casts for arm and i386:intr_eoi_src() instead of wrapper
routines since to trim one extra indirection.
Compiled on: {arm,amd64,i386,ia64,ppc,sparc64} x {FILTER, !FILTER}
Tested on: {amd64,i386} x {FILTER, !FILTER}
Diffstat (limited to 'sys/ia64')
-rw-r--r-- | sys/ia64/ia64/interrupt.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sys/ia64/ia64/interrupt.c b/sys/ia64/ia64/interrupt.c index d832dd8..720e5f9 100644 --- a/sys/ia64/ia64/interrupt.c +++ b/sys/ia64/ia64/interrupt.c @@ -340,10 +340,7 @@ ia64_setup_intr(const char *name, int irq, driver_filter_t filter, return (ENOMEM); error = intr_event_create(&i->event, (void *)(uintptr_t)vector, - 0, ia64_intr_unmask, -#ifdef INTR_FILTER - ia64_intr_eoi, ia64_intr_mask, -#endif + 0, ia64_intr_mask, ia64_intr_unmask, ia64_intr_eoi, NULL, "irq%u:", irq); if (error) { free(i, M_DEVBUF); |