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

1 files changed, 5 insertions, 8 deletions

diff --git a/sys/scsi/scsi_base.c b/sys/scsi/scsi_base.c
index d5356f23a78..4396042bca9 100644
--- a/sys/scsi/scsi_base.c
+++ b/sys/scsi/scsi_base.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: scsi_base.c,v 1.224 2016/03/12 15:16:04 krw Exp $	*/
+/*	$OpenBSD: scsi_base.c,v 1.225 2016/09/15 02:00:18 dlg Exp $	*/
 /*	$NetBSD: scsi_base.c,v 1.43 1997/04/02 02:29:36 mycroft Exp $	*/
 
 /*
@@ -126,13 +126,10 @@ scsi_init(void)
 #endif
 
 	/* Initialize the scsi_xfer pool. */
-	pool_init(&scsi_xfer_pool, sizeof(struct scsi_xfer), 0,
-	    0, 0, "scxspl", NULL);
-	pool_setipl(&scsi_xfer_pool, IPL_BIO);
-	/* Initialize the scsi_plug pool */
-	pool_init(&scsi_plug_pool, sizeof(struct scsi_plug), 0,
-	    0, 0, "scsiplug", NULL);
-	pool_setipl(&scsi_plug_pool, IPL_BIO);
+	pool_init(&scsi_xfer_pool, sizeof(struct scsi_xfer), 0, IPL_BIO, 0,
+	    "scxspl", NULL);
+	pool_init(&scsi_plug_pool, sizeof(struct scsi_plug), 0, IPL_BIO, 0,
+	    "scsiplug", NULL);
 }
 
 int