Index: sys/arm/arm/gic.h
===================================================================
--- sys/arm/arm/gic.h
+++ sys/arm/arm/gic.h
@@ -79,6 +79,6 @@
 int arm_gic_attach(device_t);
 int arm_gic_detach(device_t);
 int arm_gicv2m_attach(device_t);
-int arm_gic_intr(void *);
+driver_filter_t arm_gic_intr;
 
 #endif /* _ARM_GIC_H_ */
Index: sys/arm/ti/ti_gpio.c
===================================================================
--- sys/arm/ti/ti_gpio.c
+++ sys/arm/ti/ti_gpio.c
@@ -128,7 +128,7 @@
 #define AM335X_GPIO2_REV		0xAC000
 #define AM335X_GPIO3_REV		0xAE000
 
-static int ti_gpio_intr(void *arg);
+static driver_filter_t ti_gpio_intr;
 static int ti_gpio_detach(device_t);
 
 static int ti_gpio_pic_attach(struct ti_gpio_softc *sc);
Index: sys/dev/e1000/em_txrx.c
===================================================================
--- sys/dev/e1000/em_txrx.c
+++ sys/dev/e1000/em_txrx.c
@@ -64,7 +64,7 @@
 
 static void em_receive_checksum(uint16_t, uint8_t, if_rxd_info_t);
 static int em_determine_rsstype(u32 pkt_info);
-extern int em_intr(void *arg);
+extern driver_filter_t em_intr;
 
 struct if_txrx em_txrx = {
 	.ift_txd_encap = em_isc_txd_encap,
Index: sys/dev/e1000/if_em.c
===================================================================
--- sys/dev/e1000/if_em.c
+++ sys/dev/e1000/if_em.c
@@ -322,7 +322,7 @@
 static int	em_enable_phy_wakeup(struct e1000_softc *);
 static void	em_disable_aspm(struct e1000_softc *);
 
-int		em_intr(void *arg);
+driver_filter_t	em_intr;
 
 /* MSI-X handlers */
 static int	em_if_msix_intr_assign(if_ctx_t, int);
Index: sys/dev/e1000/igb_txrx.c
===================================================================
--- sys/dev/e1000/igb_txrx.c
+++ sys/dev/e1000/igb_txrx.c
@@ -65,7 +65,7 @@
 static int igb_determine_rsstype(uint16_t pkt_info);
 
 extern void igb_if_enable_intr(if_ctx_t ctx);
-extern int em_intr(void *arg);
+extern driver_filter_t em_intr;
 
 struct if_txrx igb_txrx = {
 	.ift_txd_encap = igb_isc_txd_encap,
Index: sys/dev/malo/if_malo.h
===================================================================
--- sys/dev/malo/if_malo.h
+++ sys/dev/malo/if_malo.h
@@ -582,7 +582,7 @@
 	MA_OWNED)
 
 int	malo_attach(uint16_t, struct malo_softc *);
-int	malo_intr(void *);
+driver_filter_t	malo_intr;
 int	malo_detach(struct malo_softc *);
 void	malo_shutdown(struct malo_softc *);
 void	malo_suspend(struct malo_softc *);
Index: sys/dev/nfe/if_nfe.c
===================================================================
--- sys/dev/nfe/if_nfe.c
+++ sys/dev/nfe/if_nfe.c
@@ -90,7 +90,7 @@
 static __inline void nfe_disable_intr(struct nfe_softc *);
 static int  nfe_ioctl(if_t, u_long, caddr_t);
 static void nfe_alloc_msix(struct nfe_softc *, int);
-static int nfe_intr(void *);
+static driver_filter_t nfe_intr;
 static void nfe_int_task(void *, int);
 static __inline void nfe_discard_rxbuf(struct nfe_softc *, int);
 static __inline void nfe_discard_jrxbuf(struct nfe_softc *, int);
Index: sys/dev/pccbb/pccbb.c
===================================================================
--- sys/dev/pccbb/pccbb.c
+++ sys/dev/pccbb/pccbb.c
@@ -172,7 +172,7 @@
 		    device_t child);
 static int	cbb_cardbus_power_disable_socket(device_t brdev,
 		    device_t child);
-static int	cbb_func_filt(void *arg);
+static driver_filter_t	cbb_func_filt;
 static void	cbb_func_intr(void *arg);
 
 static void
Index: sys/net/iflib.h
===================================================================
--- sys/net/iflib.h
+++ sys/net/iflib.h
@@ -186,7 +186,7 @@
 	int (*ift_rxd_pkt_get) (void *, if_rxd_info_t ri);
 	void (*ift_rxd_refill) (void * , if_rxd_update_t iru);
 	void (*ift_rxd_flush) (void *, uint16_t qsidx, uint8_t flidx, qidx_t pidx);
-	int (*ift_legacy_intr) (void *);
+	driver_filter_t *ift_legacy_intr;
 } *if_txrx_t;
 
 typedef struct if_softc_ctx {
Index: sys/x86/iommu/intel_dmar.h
===================================================================
--- sys/x86/iommu/intel_dmar.h
+++ sys/x86/iommu/intel_dmar.h
@@ -110,7 +110,7 @@
 	int irq_rid;
 	struct resource *irq_res;
 	void *intr_handle;
-	int (*handler)(void *);
+	driver_filter_t *handler;
 	int msi_data_reg;
 	int msi_addr_reg;
 	int msi_uaddr_reg;