5 files changed, 9 insertions, 9 deletions

diff --git a/sys/dev/cx/if_cx.c b/sys/dev/cx/if_cx.c
index c6ebc3b523675..6f6f04098e4af 100644
--- a/sys/dev/cx/if_cx.c
+++ b/sys/dev/cx/if_cx.c
@@ -2547,7 +2547,7 @@ static int cx_modevent (module_t mod, int type, void *unused)
 		callout_init (&timeout_handle, cx_mpsafenet?CALLOUT_MPSAFE:0);
 		callout_reset (&timeout_handle, hz*5, cx_timeout, 0);
 		/* Software interrupt. */
-		swi_add(&tty_ithd, "cx", cx_softintr, NULL, SWI_TTY,
+		swi_add(&tty_intr_event, "cx", cx_softintr, NULL, SWI_TTY,
 		    (cx_mpsafenet?INTR_MPSAFE:0), &cx_fast_ih);
 		break;
 	case MOD_UNLOAD:
@@ -2560,7 +2560,7 @@ static int cx_modevent (module_t mod, int type, void *unused)
 		/* If we were wait it than it reasserted now, just stop it. */
 		if (!callout_drain (&timeout_handle))
 			callout_stop (&timeout_handle);
-		ithread_remove_handler (cx_fast_ih);
+		intr_event_remove_handler (cx_fast_ih);
 		--load_count;
 		break;
 	case MOD_SHUTDOWN:
diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c
index 75acea55ea097..c09bb1de609f1 100644
--- a/sys/dev/cy/cy.c
+++ b/sys/dev/cy/cy.c
@@ -428,9 +428,9 @@ cyattach_common(cy_addr cy_iobase, int cy_align)
 			splx(s);
 
 			if (cy_fast_ih == NULL) {
-				swi_add(&tty_ithd, "cy", cypoll, NULL, SWI_TTY, 0,
+				swi_add(&tty_intr_event, "cy", cypoll, NULL, SWI_TTY, 0,
 					&cy_fast_ih);
-				swi_add(&clk_ithd, "cy", cypoll, NULL, SWI_CLOCK, 0,
+				swi_add(&clk_intr_event, "cy", cypoll, NULL, SWI_CLOCK, 0,
 					&cy_slow_ih);
 			}
 			ttycreate(tp, TS_CALLOUT, "c%r%r",
diff --git a/sys/dev/rc/rc.c b/sys/dev/rc/rc.c
index d8a825973f312..76b8cc8af8f9c 100644
--- a/sys/dev/rc/rc.c
+++ b/sys/dev/rc/rc.c
@@ -311,7 +311,7 @@ rc_attach(device_t dev)
 		goto fail;
 	}
 		
-	swi_add(&tty_ithd, "tty:rc", rc_pollcard, sc, SWI_TTY, 0,
+	swi_add(&tty_intr_event, "tty:rc", rc_pollcard, sc, SWI_TTY, 0,
 	    &sc->sc_swicookie);
 	return (0);
 
@@ -336,7 +336,7 @@ rc_detach(device_t dev)
 	error = bus_teardown_intr(dev, sc->sc_irq, sc->sc_hwicookie);
 	if (error)
 		device_printf(dev, "failed to deregister interrupt handler\n");
-	ithread_remove_handler(sc->sc_swicookie);
+	intr_event_remove_handler(sc->sc_swicookie);
 	rc_release_resources(dev);
 
 	return (0);
diff --git a/sys/dev/sab/sab.c b/sys/dev/sab/sab.c
index 1fcd8fe1042c9..b030d96a90f57 100644
--- a/sys/dev/sab/sab.c
+++ b/sys/dev/sab/sab.c
@@ -321,7 +321,7 @@ sab_attach(device_t dev)
 	for (i = 0; i < SAB_NCHAN; i++)
 		sc->sc_child[i] = device_get_softc(child[i]);
 
-	swi_add(&tty_ithd, "tty:sab", sab_softintr, sc, SWI_TTY,
+	swi_add(&tty_intr_event, "tty:sab", sab_softintr, sc, SWI_TTY,
 	    INTR_TYPE_TTY, &sc->sc_softih);
 
 	if (sabtty_cons != NULL) {
diff --git a/sys/pc98/cbus/sio.c b/sys/pc98/cbus/sio.c
index b3638d7ef98e3..2d6cc634266e0 100644
--- a/sys/pc98/cbus/sio.c
+++ b/sys/pc98/cbus/sio.c
@@ -1718,9 +1718,9 @@ determined_type: ;
 	printf("\n");
 
 	if (sio_fast_ih == NULL) {
-		swi_add(&tty_ithd, "sio", siopoll, NULL, SWI_TTY, 0,
+		swi_add(&tty_intr_event, "sio", siopoll, NULL, SWI_TTY, 0,
 		    &sio_fast_ih);
-		swi_add(&clk_ithd, "sio", siopoll, NULL, SWI_CLOCK, 0,
+		swi_add(&clk_intr_event, "sio", siopoll, NULL, SWI_CLOCK, 0,
 		    &sio_slow_ih);
 	}