redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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>
hifive-unleashed-5.1
Rusty Russell 2013-03-21 14:17:34 +00:00 committed by David S. Miller
parent 6b0c21cede
commit 9d0ca6ed6f
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/virtio_net.c
View File

@ -154,7 +154,7 @@ struct padded_vnet_hdr {
*/
static int vq2txq(struct virtqueue *vq)
{
return (virtqueue_get_queue_index(vq) - 1) / 2;
return (vq->index - 1) / 2;
}
static int txq2vq(int txq)
@ -164,7 +164,7 @@ static int txq2vq(int txq)
static int vq2rxq(struct virtqueue *vq)
{
return virtqueue_get_queue_index(vq) / 2;
return vq->index / 2;
}
static int rxq2vq(int rxq)

6
drivers/s390/kvm/virtio_ccw.c
View File

@ -166,7 +166,7 @@ static void virtio_ccw_kvm_notify(struct virtqueue *vq)
vcdev = to_vc_device(info->vq->vdev);
ccw_device_get_schid(vcdev->cdev, &schid);
do_kvm_notify(schid, virtqueue_get_queue_index(vq));
do_kvm_notify(schid, vq->index);
}
static 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)
unsigned long flags;
unsigned long size;
int ret;
unsigned int index = virtqueue_get_queue_index(vq);
unsigned int index = vq->index;
/* Remove from our list. */
spin_lock_irqsave(&vcdev->lock, flags);
@ -610,7 +610,7 @@ static struct virtqueue *virtio_ccw_vq_by_ind(struct virtio_ccw_device *vcdev,
vq = NULL;
spin_lock_irqsave(&vcdev->lock, flags);
list_for_each_entry(info, &vcdev->virtqueues, node) {
if (virtqueue_get_queue_index(info->vq) == index) {
if (info->vq->index == index) {
vq = info->vq;
break;
}

6
include/linux/virtio.h
View File

@ -58,12 +58,6 @@ void *virtqueue_detach_unused_buf(struct virtqueue *vq);
unsigned int virtqueue_get_vring_size(struct virtqueue *vq);
/* FIXME: Obsolete accessor, but required for virtio_net merge. */
static inline unsigned int virtqueue_get_queue_index(struct virtqueue *vq)
{
return vq->index;
}
/**
* virtio_device - representation of a device using virtio
* @index: unique position on the virtio bus