diff options
| author |   jasper <jasper@openbsd.org> | 2010-06-24 21:17:59 +0000 |
|---|---|---|
| committer | jasper <jasper@openbsd.org> | 2010-06-24 21:17:59 +0000 |
| commit | a602fee9fb5cdd44dfaffa5ceb2ec624c1a691b7 (patch) | |
| tree | 58b1c7e9a8c73b6e966ef84c7f92c016af6a140d /sys/dev/isa/isapnp.c | |
| parent | this just had to be here... (diff) | |
| download | wireguard-openbsd-a602fee9fb5cdd44dfaffa5ceb2ec624c1a691b7.tar.xz wireguard-openbsd-a602fee9fb5cdd44dfaffa5ceb2ec624c1a691b7.zip | |
- remove ISAPNP_FREE and ISAPNP_MALLOC macro's and just use them inline.
ok thib@ deraadt@
Diffstat (limited to 'sys/dev/isa/isapnp.c')
| -rw-r--r-- | sys/dev/isa/isapnp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/isa/isapnp.c b/sys/dev/isa/isapnp.c index fe9a1c9c84e..8fd3b6c4cf1 100644 --- a/sys/dev/isa/isapnp.c +++ b/sys/dev/isa/isapnp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: isapnp.c,v 1.36 2008/05/21 19:20:08 miod Exp $ */ +/* $OpenBSD: isapnp.c,v 1.37 2010/06/24 21:17:59 jasper Exp $ */ /* $NetBSD: isapnp.c,v 1.9.4.3 1997/10/29 00:40:43 thorpej Exp $ */ /* @@ -443,7 +443,7 @@ isapnp_bestconfig(isa, sc, ipa) return best; } - ISAPNP_FREE(best); + free(best, M_DEVBUF); continue; } else { @@ -455,7 +455,7 @@ isapnp_bestconfig(isa, sc, ipa) continue; d = c->ipa_sibling; if (SAMEDEV(c, best)) - ISAPNP_FREE(c); + free(c, M_DEVBUF); else { if (n) n->ipa_sibling = c; @@ -939,7 +939,7 @@ isapnp_attach(parent, self, aux) if (lpa->ipa_pref == ISAPNP_DEP_CONFLICTING) { isapnp_print(lpa, self->dv_xname); printf(" resource conflict\n"); - ISAPNP_FREE(lpa); + free(lpa, M_DEVBUF); continue; } @@ -964,7 +964,7 @@ isapnp_attach(parent, self, aux) printf(" not configured\n"); isapnp_write_reg(sc, ISAPNP_ACTIVATE, 0); } - ISAPNP_FREE(lpa); + free(lpa, M_DEVBUF); } isapnp_write_reg(sc, ISAPNP_WAKE, 0); /* Good night cards */ } |