summaryrefslogtreecommitdiff
path: root/sys/dev/pci/maestro.c
diff options
context:
space:
mode:
authorDoug Hogan <doug@cvs.openbsd.org>2014-09-13 16:06:38 +0000
committerDoug Hogan <doug@cvs.openbsd.org>2014-09-13 16:06:38 +0000
commitea858dabe0f76712b2416cf2288222c8cbba5028 (patch)
tree329401494d1f8b23d1f11679cf89acb4ae8c0e77 /sys/dev/pci/maestro.c
parentbeb9041963b2a9e31afc7ab688f1da1a386cbf9c (diff)
Replace all queue *_END macro calls except CIRCLEQ_END with NULL.
CIRCLEQ_* is deprecated and not called in the tree. The other queue types have *_END macros which were added for symmetry with CIRCLEQ_END. They are defined as NULL. There's no reason to keep the other *_END macro calls. ok millert@
Diffstat (limited to 'sys/dev/pci/maestro.c')
-rw-r--r--sys/dev/pci/maestro.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/pci/maestro.c b/sys/dev/pci/maestro.c
index c949f493dc6..890eae1a4b0 100644
--- a/sys/dev/pci/maestro.c
+++ b/sys/dev/pci/maestro.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: maestro.c,v 1.37 2014/07/12 18:48:52 tedu Exp $ */
+/* $OpenBSD: maestro.c,v 1.38 2014/09/13 16:06:37 doug Exp $ */
/* $FreeBSD: /c/ncvs/src/sys/dev/sound/pci/maestro.c,v 1.3 2000/11/21 12:22:11 julian Exp $ */
/*
* FreeBSD's ESS Agogo/Maestro driver
@@ -1819,7 +1819,7 @@ salloc_alloc(salloc_t pool, size_t size)
SLIST_FOREACH(zone, &pool->free, link)
if (zone->size >= size)
break;
- if (zone == SLIST_END(&pool->free))
+ if (zone == NULL)
return NULL;
if (zone->size == size) {
SLIST_REMOVE(&pool->free, zone, salloc_zone, link);
@@ -1847,7 +1847,7 @@ salloc_free(salloc_t pool, caddr_t addr)
if (zone->addr == addr)
break;
#ifdef DIAGNOSTIC
- if (zone == SLIST_END(&pool->used))
+ if (zone == NULL)
panic("salloc_free: freeing unallocated memory");
#endif
SLIST_REMOVE(&pool->used, zone, salloc_zone, link);