From: sf <sf@openbsd.org>
Date: Fri, 10 Apr 2015 20:00:26 +0000 (+0000)
Subject: Axe vq_free_entry_locked
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=50b98d144195fd34a16927c88ea3a9b58ab10e36;p=openbsd

Axe vq_free_entry_locked

A leftover from netbsd
---

diff --git a/sys/dev/pci/virtio.c b/sys/dev/pci/virtio.c
index 392ff70afad..ceab13b70e2 100644
--- a/sys/dev/pci/virtio.c
+++ b/sys/dev/pci/virtio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: virtio.c,v 1.14 2015/04/10 19:59:19 sf Exp $	*/
+/*	$OpenBSD: virtio.c,v 1.15 2015/04/10 20:00:26 sf Exp $	*/
 /*	$NetBSD: virtio.c,v 1.3 2011/11/02 23:05:52 njoly Exp $	*/
 
 /*
@@ -51,7 +51,6 @@
 void		 virtio_init_vq(struct virtio_softc *,
 				struct virtqueue *, int);
 void		 vq_free_entry(struct virtqueue *, struct vq_entry *);
-void		 vq_free_entry_locked(struct virtqueue *, struct vq_entry *);
 struct vq_entry	*vq_alloc_entry(struct virtqueue *);
 
 struct cfdriver virtio_cd = {
@@ -458,13 +457,6 @@ vq_alloc_entry(struct virtqueue *vq)
 
 void
 vq_free_entry(struct virtqueue *vq, struct vq_entry *qe)
-{
-	SIMPLEQ_INSERT_TAIL(&vq->vq_freelist, qe, qe_list);
-	return;
-}
-
-void
-vq_free_entry_locked(struct virtqueue *vq, struct vq_entry *qe)
 {
 	SIMPLEQ_INSERT_TAIL(&vq->vq_freelist, qe, qe_list);
 }
@@ -723,10 +715,10 @@ virtio_enqueue_abort(struct virtqueue *vq, int slot)
 	vd = &vq->vq_desc[0];
 	while (vd[s].flags & VRING_DESC_F_NEXT) {
 		s = vd[s].next;
-		vq_free_entry_locked(vq, qe);
+		vq_free_entry(vq, qe);
 		qe = &vq->vq_entries[s];
 	}
-	vq_free_entry_locked(vq, qe);
+	vq_free_entry(vq, qe);
 	return 0;
 }
 
@@ -777,10 +769,10 @@ virtio_dequeue_commit(struct virtqueue *vq, int slot)
 
 	while (vd[s].flags & VRING_DESC_F_NEXT) {
 		s = vd[s].next;
-		vq_free_entry_locked(vq, qe);
+		vq_free_entry(vq, qe);
 		qe = &vq->vq_entries[s];
 	}
-	vq_free_entry_locked(vq, qe);
+	vq_free_entry(vq, qe);
 
 	return 0;
 }