diff options
author | Miod Vallat <miod@cvs.openbsd.org> | 2024-03-29 21:29:35 +0000 |
---|---|---|
committer | Miod Vallat <miod@cvs.openbsd.org> | 2024-03-29 21:29:35 +0000 |
commit | 3c247f0907266f60ab1437eb926539940a010a92 (patch) | |
tree | f57695377f45cb77ab6b6151519f4d1a4e518472 /sys/arch/sparc64/dev/psycho.c | |
parent | 61e38aa522496ed88842eb050db891bdc9611c83 (diff) |
Drop the first argument of intr_establish().
Instead, require all callers to put the right value in the ih_pil field, and
have intr_establish() trust them rather than assigning this field again from
its first argument.
ok claudio@ kettenis@
Diffstat (limited to 'sys/arch/sparc64/dev/psycho.c')
-rw-r--r-- | sys/arch/sparc64/dev/psycho.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/sparc64/dev/psycho.c b/sys/arch/sparc64/dev/psycho.c index f3c5b29a30a..377eefc6f60 100644 --- a/sys/arch/sparc64/dev/psycho.c +++ b/sys/arch/sparc64/dev/psycho.c @@ -1,4 +1,4 @@ -/* $OpenBSD: psycho.c,v 1.83 2023/04/11 00:45:08 jsg Exp $ */ +/* $OpenBSD: psycho.c,v 1.84 2024/03/29 21:29:33 miod Exp $ */ /* $NetBSD: psycho.c,v 1.39 2001/10/07 20:30:41 eeh Exp $ */ /* @@ -681,7 +681,7 @@ psycho_set_intr(struct psycho_softc *sc, int ipl, void *handler, ih->ih_map = mapper; ih->ih_clr = clearer; ih->ih_fun = handler; - ih->ih_pil = (1 << ipl); + ih->ih_pil = ipl; ih->ih_number = INTVEC(*(ih->ih_map)); snprintf(ih->ih_name, sizeof(ih->ih_name), "%s:%s", sc->sc_dev.dv_xname, suffix); @@ -691,7 +691,7 @@ psycho_set_intr(struct psycho_softc *sc, int ipl, void *handler, ih->ih_fun, ih->ih_arg, sc->sc_dev.dv_xname, ih->ih_number, ih->ih_pil)); - intr_establish(ipl, ih); + intr_establish(ih); } /* @@ -1286,7 +1286,7 @@ found: if (flags & BUS_INTR_ESTABLISH_MPSAFE) ih->ih_mpsafe = 1; - intr_establish(ih->ih_pil, ih); + intr_establish(ih); /* * Enable the interrupt now we have the handler installed. |