From 9d8236625502d9aebd87ee4b8aa759eb7dd062ae Mon Sep 17 00:00:00 2001 From: David Gwynne Date: Thu, 15 Sep 2016 02:00:19 +0000 Subject: 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); --- sys/dev/pci/if_myx.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'sys/dev/pci/if_myx.c') diff --git a/sys/dev/pci/if_myx.c b/sys/dev/pci/if_myx.c index cae0b82daa3..f6ec1af9830 100644 --- a/sys/dev/pci/if_myx.c +++ b/sys/dev/pci/if_myx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_myx.c,v 1.95 2016/05/23 15:22:44 tedu Exp $ */ +/* $OpenBSD: if_myx.c,v 1.96 2016/09/15 02:00:17 dlg Exp $ */ /* * Copyright (c) 2007 Reyk Floeter @@ -302,9 +302,8 @@ myx_attach(struct device *parent, struct device *self, void *aux) DEVNAME(sc)); goto unmap; } - pool_init(myx_mcl_pool, MYX_RXBIG_SIZE, MYX_BOUNDARY, 0, + pool_init(myx_mcl_pool, MYX_RXBIG_SIZE, MYX_BOUNDARY, IPL_NET, 0, "myxmcl", NULL); - pool_setipl(myx_mcl_pool, IPL_NET); pool_set_constraints(myx_mcl_pool, &kp_dma_contig); } -- cgit v1.2.3