From 10b2717ca72969a164f57468f028ba0da6c18251 Mon Sep 17 00:00:00 2001 From: jhb Date: Wed, 26 Oct 2005 15:52:16 +0000 Subject: - Use swi_remove() to teardown swi handlers rather than intr_event_remove_handler(). - Remove tty: prefix from a couple of swi handler names. --- sys/dev/rc/rc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sys/dev/rc') 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); -- cgit v1.1