Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d0ca6ed authored by Rusty Russell's avatar Rusty Russell Committed by David S. Miller
Browse files

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: default avatarRusty Russell <rusty@rustcorp.com.au>
Acked-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6b0c21ce

drivers/net/virtio_net.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -154,7 +154,7 @@ struct padded_vnet_hdr { 
 */

 */

static int vq2txq(struct virtqueue *vq)

static int vq2txq(struct virtqueue *vq)

{

{

	return (virtqueue_get_queue_index(vq) - 1) / 2;

	return (vq->index - 1) / 2;

}

}





static int txq2vq(int txq)

static int txq2vq(int txq)
@@ -164,7 +164,7 @@ static int txq2vq(int txq) 




static int vq2rxq(struct virtqueue *vq)

static int vq2rxq(struct virtqueue *vq)

{

{

	return virtqueue_get_queue_index(vq) / 2;

	return vq->index / 2;

}

}





static int rxq2vq(int rxq)

static int rxq2vq(int rxq)

drivers/s390/kvm/virtio_ccw.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -166,7 +166,7 @@ static void virtio_ccw_kvm_notify(struct virtqueue *vq) 




	vcdev = to_vc_device(info->vq->vdev);

	vcdev = to_vc_device(info->vq->vdev);

	ccw_device_get_schid(vcdev->cdev, &schid);

	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,

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 flags;

	unsigned long size;

	unsigned long size;

	int ret;

	int ret;

	unsigned int index = virtqueue_get_queue_index(vq);

	unsigned int index = vq->index;





	/* Remove from our list. */

	/* Remove from our list. */

	spin_lock_irqsave(&vcdev->lock, flags);

	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;

	vq = NULL;

	spin_lock_irqsave(&vcdev->lock, flags);

	spin_lock_irqsave(&vcdev->lock, flags);

	list_for_each_entry(info, &vcdev->virtqueues, node) {

	list_for_each_entry(info, &vcdev->virtqueues, node) {

		if (virtqueue_get_queue_index(info->vq) == index) {

		if (info->vq->index == index) {

			vq = info->vq;

			vq = info->vq;

			break;

			break;

		}

		}

include/linux/virtio.h

+0 −6
Original line number Original line Diff line number Diff line
@@ -58,12 +58,6 @@ void *virtqueue_detach_unused_buf(struct virtqueue *vq); 




unsigned int virtqueue_get_vring_size(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

 * virtio_device - representation of a device using virtio

 * @index: unique position on the virtio bus

 * @index: unique position on the virtio bus