virtio: remove obsolete virtqueue_get_queue_index()
Subsystems (5)
PATCH 1/1 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.'
(Handing to DaveM for Ack or just take it...)
Cc Cornelia Huck <[email protected]>
Signed-off-by Rusty Russell <[email protected]>
Acked-by Cornelia Huck <[email protected]>
drivers/net/virtio_net.c +2 -2
@@ -153,7 +153,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)
@@ -163,7 +163,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)
drivers/s390/kvm/virtio_ccw.c +3 -3
@@ -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 ; }
include/linux/virtio.h +0 -6
@@ -76,12 +76,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
David Miller
maintainerFrom: Rusty Russell <[email protected]>
Date: Mon, 25 Mar 2013 10:33:57 +1030
Quoted 9 lines
You can access it directly now, since 3.8: v3.7-rc1-13-g06ca287 'virtio: move
queue_indexandnum_freefields into core struct virtqueue.'(Handing to DaveM for Ack or just take it...)
Cc Cornelia Huck <[email protected]>Signed-off-by Rusty Russell <[email protected]>Acked-by Cornelia Huck <[email protected]>
This is already in my net-next tree.