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, 2 insertions, 6 deletions

diff --git a/sys/sparc64/sparc64/intr_machdep.c b/sys/sparc64/sparc64/intr_machdep.c
index 091ed90..115d486 100644
--- a/sys/sparc64/sparc64/intr_machdep.c
+++ b/sys/sparc64/sparc64/intr_machdep.c
@@ -329,12 +329,8 @@ intr_controller_register(int vec, const struct intr_controller *ic,
 	 * CPU as long as the source of a level sensitive interrupt is
 	 * not cleared.
 	 */
-	error = intr_event_create(&ie, iv, 0, intr_enable_eoi,
-#ifdef INTR_FILTER
-	    ic->ic_eoi, ic->ic_disable, NULL, "vec%d:", vec);
-#else
-	    NULL, "vec%d:", vec);
-#endif
+	error = intr_event_create(&ie, iv, 0, ic->ic_disable, intr_enable_eoi,
+	    ic->ic_eoi, NULL, "vec%d:", vec);
 	if (error != 0)
 		return (error);
 	mtx_lock_spin(&intr_table_lock);