[PATCH V2 08/19] virtio_ring: switch to use vring_virtqueue for enable_cb_prepare 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 | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
index 4e70b7eb127f..8c18f3edda00 100644
--- a/drivers/virtio/virtio_ring.c
+++ b/drivers/virtio/virtio_ring.c
@@ -893,9 +893,8 @@ static void virtqueue_disable_cb_split(struct virtqueue 
*_vq)
        }
 }
 
-static unsigned int virtqueue_enable_cb_prepare_split(struct virtqueue *_vq)
+static unsigned int virtqueue_enable_cb_prepare_split(struct vring_virtqueue 
*vq)
 {
-       struct vring_virtqueue *vq = to_vvq(_vq);
        u16 last_used_idx;
 
        START_USE(vq);
@@ -909,10 +908,10 @@ static unsigned int 
virtqueue_enable_cb_prepare_split(struct virtqueue *_vq)
                vq->split.avail_flags_shadow &= ~VRING_AVAIL_F_NO_INTERRUPT;
                if (!vq->event)
                        vq->split.vring.avail->flags =
-                               cpu_to_virtio16(_vq->vdev,
+                               cpu_to_virtio16(vq->vq.vdev,
                                                vq->split.avail_flags_shadow);
        }
-       vring_used_event(&vq->split.vring) = cpu_to_virtio16(_vq->vdev,
+       vring_used_event(&vq->split.vring) = cpu_to_virtio16(vq->vq.vdev,
                        last_used_idx = vq->last_used_idx);
        END_USE(vq);
        return last_used_idx;
@@ -1807,10 +1806,8 @@ static void virtqueue_disable_cb_packed(struct virtqueue 
*_vq)
        }
 }
 
-static unsigned int virtqueue_enable_cb_prepare_packed(struct virtqueue *_vq)
+static unsigned int virtqueue_enable_cb_prepare_packed(struct vring_virtqueue 
*vq)
 {
-       struct vring_virtqueue *vq = to_vvq(_vq);
-
        START_USE(vq);
 
        /*
@@ -2568,8 +2565,8 @@ unsigned int virtqueue_enable_cb_prepare(struct virtqueue 
*_vq)
        if (vq->event_triggered)
                vq->event_triggered = false;
 
-       return vq->packed_ring ? virtqueue_enable_cb_prepare_packed(_vq) :
-                                virtqueue_enable_cb_prepare_split(_vq);
+       return vq->packed_ring ? virtqueue_enable_cb_prepare_packed(vq) :
+                                virtqueue_enable_cb_prepare_split(vq);
 }
 EXPORT_SYMBOL_GPL(virtqueue_enable_cb_prepare);
 
-- 
2.31.1