d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Use swi_remove() to teardown swi handlers rather than

Browse Source 
intr_event_remove_handler().
- Remove tty: prefix from a couple of swi handler names.
This commit is contained in:
John Baldwin 2005-10-26 15:52:16 +00:00
parent fe486a370a
commit 284b6708c4
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/dev/cx/if_cx.c
View File

@ -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:

4
sys/dev/rc/rc.c
View File

@ -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);

2
sys/dev/sab/sab.c
View File

@ -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) {

2
sys/dev/uart/uart_tty.c
View File

@ -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);

2
sys/dev/zs/zs.c
View File

@ -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]);

4
sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c
View File

@ -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);