On Mon, Mar 24, 2025 at 6:44 AM Jason Wang <jasow...@redhat.com> wrote:
>
> Those variants are used internally so let's switch to use
> vring_virtqueue as parameter to be consistent with other internal
> virtqueue helpers.
>
Acked-by: Eugenio Pérez <epere...@redhat.com>
> Signed-off-by: Jason Wang <jasow...@redhat.com>
> ---
> drivers/virtio/virtio_ring.c | 14 +++++---------
> 1 file changed, 5 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
> index af8ce6e9d892..f754da8c2ac6 100644
> --- a/drivers/virtio/virtio_ring.c
> +++ b/drivers/virtio/virtio_ring.c
> @@ -869,10 +869,8 @@ static void *virtqueue_get_buf_ctx_split(struct
> vring_virtqueue *vq,
> return ret;
> }
>
> -static void virtqueue_disable_cb_split(struct virtqueue *_vq)
> +static void virtqueue_disable_cb_split(struct vring_virtqueue *vq)
> {
> - struct vring_virtqueue *vq = to_vvq(_vq);
> -
> if (!(vq->split.avail_flags_shadow & VRING_AVAIL_F_NO_INTERRUPT)) {
> vq->split.avail_flags_shadow |= VRING_AVAIL_F_NO_INTERRUPT;
>
> @@ -888,7 +886,7 @@ static void virtqueue_disable_cb_split(struct virtqueue
> *_vq)
> vring_used_event(&vq->split.vring) = 0x0;
> else
> vq->split.vring.avail->flags =
> - cpu_to_virtio16(_vq->vdev,
> + cpu_to_virtio16(vq->vq.vdev,
> vq->split.avail_flags_shadow);
> }
> }
> @@ -1786,10 +1784,8 @@ static void *virtqueue_get_buf_ctx_packed(struct
> vring_virtqueue *vq,
> return ret;
> }
>
> -static void virtqueue_disable_cb_packed(struct virtqueue *_vq)
> +static void virtqueue_disable_cb_packed(struct vring_virtqueue *vq)
> {
> - struct vring_virtqueue *vq = to_vvq(_vq);
> -
> if (vq->packed.event_flags_shadow != VRING_PACKED_EVENT_FLAG_DISABLE)
> {
> vq->packed.event_flags_shadow =
> VRING_PACKED_EVENT_FLAG_DISABLE;
>
> @@ -2538,9 +2534,9 @@ void virtqueue_disable_cb(struct virtqueue *_vq)
> struct vring_virtqueue *vq = to_vvq(_vq);
>
> if (vq->packed_ring)
> - virtqueue_disable_cb_packed(_vq);
> + virtqueue_disable_cb_packed(vq);
> else
> - virtqueue_disable_cb_split(_vq);
> + virtqueue_disable_cb_split(vq);
> }
> EXPORT_SYMBOL_GPL(virtqueue_disable_cb);
>
> --
> 2.42.0
>
