summaryrefslogtreecommitdiff
path: root/sys/dev/usb/uhci.c
diff options
context:
space:
mode:
authorMartin Pieuchot <mpi@cvs.openbsd.org>2017-05-15 10:52:09 +0000
committerMartin Pieuchot <mpi@cvs.openbsd.org>2017-05-15 10:52:09 +0000
commitfdd3b609f3d815b02404385429cc8717b884fa4a (patch)
treeec27c8d8d48122f9fc9a543b8b65d69ba5c6d7c3 /sys/dev/usb/uhci.c
parenta86f28047ab6558187779a8500c064054517d06f (diff)
Replace remaining SPLUSBCHECK by a splsoftassert(IPL_SOFTUSB).
USB is the last real user of IPL_SOFTNET.
Diffstat (limited to 'sys/dev/usb/uhci.c')
-rw-r--r--sys/dev/usb/uhci.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c
index 7cc3127a7e3..412d06d9b05 100644
--- a/sys/dev/usb/uhci.c
+++ b/sys/dev/usb/uhci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uhci.c,v 1.142 2017/03/10 11:18:48 mpi Exp $ */
+/* $OpenBSD: uhci.c,v 1.143 2017/05/15 10:52:08 mpi Exp $ */
/* $NetBSD: uhci.c,v 1.172 2003/02/23 04:19:26 simonb Exp $ */
/* $FreeBSD: src/sys/dev/usb/uhci.c,v 1.33 1999/11/17 22:33:41 n_hibma Exp $ */
@@ -870,7 +870,7 @@ uhci_add_hs_ctrl(struct uhci_softc *sc, struct uhci_soft_qh *sqh)
{
struct uhci_soft_qh *eqh;
- SPLUSBCHECK;
+ splsoftassert(IPL_SOFTUSB);
DPRINTFN(10, ("uhci_add_hs_ctrl: sqh=%p\n", sqh));
eqh = sc->sc_hctl_end;
@@ -890,7 +890,7 @@ uhci_remove_hs_ctrl(struct uhci_softc *sc, struct uhci_soft_qh *sqh)
{
struct uhci_soft_qh *pqh;
- SPLUSBCHECK;
+ splsoftassert(IPL_SOFTUSB);
DPRINTFN(10, ("uhci_remove_hs_ctrl: sqh=%p\n", sqh));
#ifdef UHCI_CTL_LOOP
@@ -923,7 +923,7 @@ uhci_add_ls_ctrl(struct uhci_softc *sc, struct uhci_soft_qh *sqh)
{
struct uhci_soft_qh *eqh;
- SPLUSBCHECK;
+ splsoftassert(IPL_SOFTUSB);
DPRINTFN(10, ("uhci_add_ls_ctrl: sqh=%p\n", sqh));
eqh = sc->sc_lctl_end;
@@ -940,7 +940,7 @@ uhci_remove_ls_ctrl(struct uhci_softc *sc, struct uhci_soft_qh *sqh)
{
struct uhci_soft_qh *pqh;
- SPLUSBCHECK;
+ splsoftassert(IPL_SOFTUSB);
DPRINTFN(10, ("uhci_remove_ls_ctrl: sqh=%p\n", sqh));
/* See comment in uhci_remove_hs_ctrl() */
@@ -962,7 +962,7 @@ uhci_add_bulk(struct uhci_softc *sc, struct uhci_soft_qh *sqh)
{
struct uhci_soft_qh *eqh;
- SPLUSBCHECK;
+ splsoftassert(IPL_SOFTUSB);
DPRINTFN(10, ("uhci_add_bulk: sqh=%p\n", sqh));
eqh = sc->sc_bulk_end;
@@ -980,7 +980,7 @@ uhci_remove_bulk(struct uhci_softc *sc, struct uhci_soft_qh *sqh)
{
struct uhci_soft_qh *pqh;
- SPLUSBCHECK;
+ splsoftassert(IPL_SOFTUSB);
DPRINTFN(10, ("uhci_remove_bulk: sqh=%p\n", sqh));
uhci_rem_loop(sc);