diff --git a/sys/kern/kern_intr.c b/sys/kern/kern_intr.c
--- a/sys/kern/kern_intr.c
+++ b/sys/kern/kern_intr.c
@@ -1329,8 +1329,8 @@
  *
  * Input:
  * o ie:                        the event connected to this interrupt.
- * o frame:                     some archs (i.e. i386) pass a frame to some.
- *                              handlers as their main argument.
+ * o frame:                     the current trap frame.
+ *
  * Return value:
  * o 0:                         everything ok.
  * o non-0:                     stray interrupt, current count.
@@ -1366,9 +1366,6 @@
 
 	/*
 	 * Execute fast interrupt handlers directly.
-	 * To support clock handlers, if a handler registers
-	 * with a NULL argument, then we pass it a pointer to
-	 * a trapframe as its argument.
 	 */
 	td->td_intr_nesting_level++;
 	filter = false;
@@ -1397,12 +1394,8 @@
 			continue;
 		}
 		CTR4(KTR_INTR, "%s: exec %p(%p) for %s", __func__,
-		    ih->ih_filter, ih->ih_argument == NULL ? frame :
-		    ih->ih_argument, ih->ih_name);
-		if (ih->ih_argument == NULL)
-			ret = ih->ih_filter(frame);
-		else
-			ret = ih->ih_filter(ih->ih_argument);
+		    ih->ih_filter, ih->ih_argument, ih->ih_name);
+		ret = ih->ih_filter(ih->ih_argument);
 #ifdef HWPMC_HOOKS
 		PMC_SOFT_CALL_TF( , , intr, all, frame);
 #endif