summaryrefslogtreecommitdiff
path: root/sys/dev/usb/uhci.c
diff options
context:
space:
mode:
authorDavid Gwynne <dlg@cvs.openbsd.org>2016-09-15 02:00:19 +0000
committerDavid Gwynne <dlg@cvs.openbsd.org>2016-09-15 02:00:19 +0000
commit9d8236625502d9aebd87ee4b8aa759eb7dd062ae (patch)
tree608f67fdaff3caceaeb03f449b57d21037a3fe79 /sys/dev/usb/uhci.c
parent2470899b803a7fb5d135883edd5ddd82d6a592c7 (diff)
all pools have their ipl set via pool_setipl, so fold it into pool_init.
the ioff argument to pool_init() is unused and has been for many years, so this replaces it with an ipl argument. because the ipl will be set on init we no longer need pool_setipl. most of these changes have been done with coccinelle using the spatch below. cocci sucks at formatting code though, so i fixed that by hand. the manpage and subr_pool.c bits i did myself. ok tedu@ jmatthew@ @ipl@ expression pp; expression ipl; expression s, a, o, f, m, p; @@ -pool_init(pp, s, a, o, f, m, p); -pool_setipl(pp, ipl); +pool_init(pp, s, a, ipl, f, m, p);
Diffstat (limited to 'sys/dev/usb/uhci.c')
-rw-r--r--sys/dev/usb/uhci.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c
index 01437345118..3d9da9b4805 100644
--- a/sys/dev/usb/uhci.c
+++ b/sys/dev/usb/uhci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uhci.c,v 1.138 2015/06/26 11:17:34 mpi Exp $ */
+/* $OpenBSD: uhci.c,v 1.139 2016/09/15 02:00:17 dlg 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 $ */
@@ -370,9 +370,8 @@ uhci_init(struct uhci_softc *sc)
sc->sc_bus.bdev.dv_xname);
return (ENOMEM);
}
- pool_init(uhcixfer, sizeof(struct uhci_xfer), 0, 0, 0,
- "uhcixfer", NULL);
- pool_setipl(uhcixfer, IPL_SOFTUSB);
+ pool_init(uhcixfer, sizeof(struct uhci_xfer), 0, IPL_SOFTUSB,
+ 0, "uhcixfer", NULL);
}
/* Restore saved SOF. */