aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2013-03-21 10:17:34 -0400
committerDavid S. Miller <davem@davemloft.net>2013-03-22 10:23:34 -0400
commit9d0ca6ed6f2f12eb488f450d5d38d047aa402a53 (patch)
treedbcab55565593924298fbde1d83456b7c2f49bbc /drivers/s390
parent6b0c21cede22be1f68f0a632c0ca38008ce1abe7 (diff)
virtio: remove obsolete virtqueue_get_queue_index()
You can access it directly now, since 3.8: v3.7-rc1-13-g06ca287 'virtio: move queue_index and num_free fields into core struct virtqueue.' Cc: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/s390')
-rw-r--r--drivers/s390/kvm/virtio_ccw.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/s390/kvm/virtio_ccw.c b/drivers/s390/kvm/virtio_ccw.c
index 2029b6caa595..fb877b59ec57 100644
--- a/drivers/s390/kvm/virtio_ccw.c
+++ b/drivers/s390/kvm/virtio_ccw.c
@@ -166,7 +166,7 @@ static void virtio_ccw_kvm_notify(struct virtqueue *vq)
166 166
167 vcdev = to_vc_device(info->vq->vdev); 167 vcdev = to_vc_device(info->vq->vdev);
168 ccw_device_get_schid(vcdev->cdev, &schid); 168 ccw_device_get_schid(vcdev->cdev, &schid);
169 do_kvm_notify(schid, virtqueue_get_queue_index(vq)); 169 do_kvm_notify(schid, vq->index);
170} 170}
171 171
172static int virtio_ccw_read_vq_conf(struct virtio_ccw_device *vcdev, 172static int virtio_ccw_read_vq_conf(struct virtio_ccw_device *vcdev,
@@ -188,7 +188,7 @@ static void virtio_ccw_del_vq(struct virtqueue *vq, struct ccw1 *ccw)
188 unsigned long flags; 188 unsigned long flags;
189 unsigned long size; 189 unsigned long size;
190 int ret; 190 int ret;
191 unsigned int index = virtqueue_get_queue_index(vq); 191 unsigned int index = vq->index;
192 192
193 /* Remove from our list. */ 193 /* Remove from our list. */
194 spin_lock_irqsave(&vcdev->lock, flags); 194 spin_lock_irqsave(&vcdev->lock, flags);
@@ -610,7 +610,7 @@ static struct virtqueue *virtio_ccw_vq_by_ind(struct virtio_ccw_device *vcdev,
610 vq = NULL; 610 vq = NULL;
611 spin_lock_irqsave(&vcdev->lock, flags); 611 spin_lock_irqsave(&vcdev->lock, flags);
612 list_for_each_entry(info, &vcdev->virtqueues, node) { 612 list_for_each_entry(info, &vcdev->virtqueues, node) {
613 if (virtqueue_get_queue_index(info->vq) == index) { 613 if (info->vq->index == index) {
614 vq = info->vq; 614 vq = info->vq;
615 break; 615 break;
616 } 616 }