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}

1 files changed, 1 insertions, 6 deletions

diff --git a/sys/powerpc/powerpc/intr_machdep.c b/sys/powerpc/powerpc/intr_machdep.c
index e05195f..990ba51 100644
--- a/sys/powerpc/powerpc/intr_machdep.c
+++ b/sys/powerpc/powerpc/intr_machdep.c
@@ -161,7 +161,6 @@ intr_lookup(u_int irq)
 	return (i);
 }
 
-#ifdef INTR_FILTER
 static void
 powerpc_intr_eoi(void *arg)
 {
@@ -177,7 +176,6 @@ powerpc_intr_mask(void *arg)
 
 	PIC_MASK(pic, irq);
 }
-#endif
 
 static void
 powerpc_intr_unmask(void *arg)
@@ -229,10 +227,7 @@ powerpc_setup_intr(const char *name, u_int irq, driver_filter_t filter,
 
 	if (i->event == NULL) {
 		error = intr_event_create(&i->event, (void *)irq, 0,
-		    powerpc_intr_unmask,
-#ifdef INTR_FILTER
-		    powerpc_intr_eoi, powerpc_intr_mask,
-#endif
+		    powerpc_intr_mask, powerpc_intr_unmask, powerpc_intr_eoi,
 		    NULL, "irq%u:", irq);
 		if (error)
 			return (error);