[PATCH V2 04/19] virtio_ring: switch to use vring_virtqueue for virtqueue resize variants

[Jason Wang]

Those variants are used internally so let's switch to use
vring_virtqueue as parameter to be consistent with other internal
virtqueue helpers.

Reviewed-by: Xuan Zhuo <xuanz...@linux.alibaba.com>
Signed-off-by: Jason Wang <jasow...@redhat.com>
---
 drivers/virtio/virtio_ring.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
index 633379b2dc42..e7be480bee67 100644
--- a/drivers/virtio/virtio_ring.c
+++ b/drivers/virtio/virtio_ring.c
@@ -1216,11 +1216,10 @@ static struct virtqueue *vring_create_virtqueue_split(
        return vq;
 }
 
-static int virtqueue_resize_split(struct virtqueue *_vq, u32 num)
+static int virtqueue_resize_split(struct vring_virtqueue *vq, u32 num)
 {
        struct vring_virtqueue_split vring_split = {};
-       struct vring_virtqueue *vq = to_vvq(_vq);
-       struct virtio_device *vdev = _vq->vdev;
+       struct virtio_device *vdev = vq->vq.vdev;
        int err;
 
        err = vring_alloc_queue_split(&vring_split, vdev, num,
@@ -2183,11 +2182,10 @@ static struct virtqueue *vring_create_virtqueue_packed(
        return vq;
 }
 
-static int virtqueue_resize_packed(struct virtqueue *_vq, u32 num)
+static int virtqueue_resize_packed(struct vring_virtqueue *vq, u32 num)
 {
        struct vring_virtqueue_packed vring_packed = {};
-       struct vring_virtqueue *vq = to_vvq(_vq);
-       struct virtio_device *vdev = _vq->vdev;
+       struct virtio_device *vdev = vq->vq.vdev;
        int err;
 
        if (vring_alloc_queue_packed(&vring_packed, vdev, num, 
vring_dma_dev(vq)))
@@ -2805,9 +2803,9 @@ int virtqueue_resize(struct virtqueue *_vq, u32 num,
                recycle_done(_vq);
 
        if (vq->packed_ring)
-               err = virtqueue_resize_packed(_vq, num);
+               err = virtqueue_resize_packed(vq, num);
        else
-               err = virtqueue_resize_split(_vq, num);
+               err = virtqueue_resize_split(vq, num);
 
        return virtqueue_enable_after_reset(_vq);
 }
-- 
2.31.1