summaryrefslogtreecommitdiff
path: root/sys/dev/pci/drm
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/drm
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/drm')
-rw-r--r--sys/dev/pci/drm/drm_drv.c5
-rw-r--r--sys/dev/pci/drm/drm_irq.c6
2 files changed, 5 insertions, 6 deletions
diff --git a/sys/dev/pci/drm/drm_drv.c b/sys/dev/pci/drm/drm_drv.c
index c7266f50d44..a155e63e709 100644
--- a/sys/dev/pci/drm/drm_drv.c
+++ b/sys/dev/pci/drm/drm_drv.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: drm_drv.c,v 1.129 2014/07/12 18:48:52 tedu Exp $ */
+/* $OpenBSD: drm_drv.c,v 1.130 2014/09/13 16:06:37 doug Exp $ */
/*-
* Copyright 2007-2009 Owain G. Ainsworth <oga@openbsd.org>
* Copyright © 2008 Intel Corporation
@@ -540,8 +540,7 @@ drmclose(dev_t kdev, int flags, int fmt, struct proc *p)
mtx_enter(&dev->event_lock);
struct drmevlist *list = &dev->vbl_events;
- for (ev = TAILQ_FIRST(list); ev != TAILQ_END(list);
- ev = evtmp) {
+ for (ev = TAILQ_FIRST(list); ev != NULL; ev = evtmp) {
evtmp = TAILQ_NEXT(ev, link);
vev = (struct drm_pending_vblank_event *)ev;
if (ev->file_priv == file_priv) {
diff --git a/sys/dev/pci/drm/drm_irq.c b/sys/dev/pci/drm/drm_irq.c
index b7dd919b1ef..e9c871d53c3 100644
--- a/sys/dev/pci/drm/drm_irq.c
+++ b/sys/dev/pci/drm/drm_irq.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: drm_irq.c,v 1.54 2014/03/09 11:07:18 jsg Exp $ */
+/* $OpenBSD: drm_irq.c,v 1.55 2014/09/13 16:06:37 doug Exp $ */
/**
* \file drm_irq.c
* IRQ support
@@ -1041,7 +1041,7 @@ void drm_vblank_off(struct drm_device *dev, int crtc)
seq = drm_vblank_count_and_time(dev, crtc, &now);
mtx_enter(&dev->event_lock);
- for (ev = TAILQ_FIRST(list); ev != TAILQ_END(list); ev = tmp) {
+ for (ev = TAILQ_FIRST(list); ev != NULL; ev = tmp) {
tmp = TAILQ_NEXT(ev, link);
vev = (struct drm_pending_vblank_event *)ev;
@@ -1336,7 +1336,7 @@ static void drm_handle_vblank_events(struct drm_device *dev, int crtc)
mtx_enter(&dev->event_lock);
- for (ev = TAILQ_FIRST(list); ev != TAILQ_END(list); ev = tmp) {
+ for (ev = TAILQ_FIRST(list); ev != NULL; ev = tmp) {
tmp = TAILQ_NEXT(ev, link);
vev = (struct drm_pending_vblank_event *)ev;