lkml.org 
[lkml]   [2022]   [Aug]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH v4 3/6] virtio-mmio: Revert "virtio_mmio: support the arg sizes of find_vqs()"
    This reverts commit fbed86abba6e0472d98079790e58060e4332608a.
    The API is now unused, let's not carry dead code around.

    Fixes: fbed86abba6e ("virtio_mmio: support the arg sizes of find_vqs()")
    Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
    ---
    drivers/virtio/virtio_mmio.c | 8 ++------
    1 file changed, 2 insertions(+), 6 deletions(-)

    diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c
    index c492a57531c6..dfcecfd7aba1 100644
    --- a/drivers/virtio/virtio_mmio.c
    +++ b/drivers/virtio/virtio_mmio.c
    @@ -360,7 +360,7 @@ static void vm_synchronize_cbs(struct virtio_device *vdev)

    static struct virtqueue *vm_setup_vq(struct virtio_device *vdev, unsigned int index,
    void (*callback)(struct virtqueue *vq),
    - const char *name, u32 size, bool ctx)
    + const char *name, bool ctx)
    {
    struct virtio_mmio_device *vm_dev = to_virtio_mmio_device(vdev);
    struct virtio_mmio_vq_info *info;
    @@ -395,11 +395,8 @@ static struct virtqueue *vm_setup_vq(struct virtio_device *vdev, unsigned int in
    goto error_new_virtqueue;
    }

    - if (!size || size > num)
    - size = num;
    -
    /* Create the vring */
    - vq = vring_create_virtqueue(index, size, VIRTIO_MMIO_VRING_ALIGN, vdev,
    + vq = vring_create_virtqueue(index, num, VIRTIO_MMIO_VRING_ALIGN, vdev,
    true, true, ctx, vm_notify, callback, name);
    if (!vq) {
    err = -ENOMEM;
    @@ -503,7 +500,6 @@ static int vm_find_vqs(struct virtio_device *vdev, unsigned int nvqs,
    }

    vqs[i] = vm_setup_vq(vdev, queue_idx++, callbacks[i], names[i],
    - sizes ? sizes[i] : 0,
    ctx ? ctx[i] : false);
    if (IS_ERR(vqs[i])) {
    vm_del_vqs(vdev);
    --
    MST
    \
     
     \ /
      Last update: 2022-08-16 10:12    [W:2.681 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site