- Use swi_remove() to teardown swi handlers rather than

  intr_event_remove_handler().
- Remove tty: prefix from a couple of swi handler names.

6 files changed, 8 insertions, 8 deletions

diff --git a/sys/dev/cx/if_cx.c b/sys/dev/cx/if_cx.c
index 6f6f040..9bf4e7b 100644
--- a/sys/dev/cx/if_cx.c
+++ b/sys/dev/cx/if_cx.c
@@ -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);
-		intr_event_remove_handler (cx_fast_ih);
+		swi_remove (cx_fast_ih);
 		--load_count;
 		break;
 	case MOD_SHUTDOWN:
diff --git a/sys/dev/rc/rc.c b/sys/dev/rc/rc.c
index 76b8cc8..1da5067 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_intr_event, "tty:rc", rc_pollcard, sc, SWI_TTY, 0,
+	swi_add(&tty_intr_event, "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");
-	intr_event_remove_handler(sc->sc_swicookie);
+	swi_remove(sc->sc_swicookie);
 	rc_release_resources(dev);
 
 	return (0);
diff --git a/sys/dev/sab/sab.c b/sys/dev/sab/sab.c
index b030d96..462ea52 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_intr_event, "tty:sab", sab_softintr, sc, SWI_TTY,
+	swi_add(&tty_intr_event, "sab", sab_softintr, sc, SWI_TTY,
 	    INTR_TYPE_TTY, &sc->sc_softih);
 
 	if (sabtty_cons != NULL) {
diff --git a/sys/dev/uart/uart_tty.c b/sys/dev/uart/uart_tty.c
index 5eb6eb1..ad0c5d1 100644
--- a/sys/dev/uart/uart_tty.c
+++ b/sys/dev/uart/uart_tty.c
@@ -392,7 +392,7 @@ int uart_tty_detach(struct uart_softc *sc)
 	tp = sc->sc_u.u_tty.tp;
 	tp->t_pps = NULL;
 	ttygone(tp);
-	intr_event_remove_handler(sc->sc_softih);
+	swi_remove(sc->sc_softih);
 	ttyfree(tp);
 
 	return (0);
diff --git a/sys/dev/zs/zs.c b/sys/dev/zs/zs.c
index c49a87e..a7f30bb 100644
--- a/sys/dev/zs/zs.c
+++ b/sys/dev/zs/zs.c
@@ -183,7 +183,7 @@ zs_attach(device_t dev)
 	for (i = 0; i < ZS_NCHAN; i++)
 		sc->sc_child[i] = device_get_softc(child[i]);
 
-	swi_add(&tty_intr_event, "tty:zs", zs_softintr, sc, SWI_TTY,
+	swi_add(&tty_intr_event, "zs", zs_softintr, sc, SWI_TTY,
 	    INTR_TYPE_TTY, &sc->sc_softih);
 
 	ZS_WRITE_REG(sc->sc_child[0], 2, sc->sc_child[0]->sc_creg[2]);
diff --git a/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c b/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c
index 2998927..ce9cfb2 100644
--- a/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c
+++ b/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c
@@ -682,7 +682,7 @@ bt3c_pccard_attach(device_t dev)
 	return (0);
 bad:
 	if (sc->ith != NULL) {
-		intr_event_remove_handler(sc->ith);
+		swi_remove(sc->ith);
 		sc->ith = NULL;
 	}
 
@@ -724,7 +724,7 @@ bt3c_pccard_detach(device_t dev)
 
 	device_set_softc(dev, NULL);
 
-	intr_event_remove_handler(sc->ith);
+	swi_remove(sc->ith);
 	sc->ith = NULL;
 
 	bus_teardown_intr(dev, sc->irq, sc->irq_cookie);