| Message ID | 20220406034346.74409-5-xuanzhuo@linux.alibaba.com |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | virtio pci support VIRTIO_F_RING_RESET (refactor vring) | expand |
在 2022/4/6 上午11:43, Xuan Zhuo 写道: > The parameter vq of vring_alloc_desc_extra() is useless. This patch > removes this parameter. > > Subsequent patches will call this function to avoid passing useless > arguments. > > Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com> Acked-by: Jason Wang <jasowang@redhat.com> > --- > drivers/virtio/virtio_ring.c | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > > diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c > index f1807f6b06a5..cb6010750a94 100644 > --- a/drivers/virtio/virtio_ring.c > +++ b/drivers/virtio/virtio_ring.c > @@ -1636,8 +1636,7 @@ static void *virtqueue_detach_unused_buf_packed(struct virtqueue *_vq) > return NULL; > } > > -static struct vring_desc_extra *vring_alloc_desc_extra(struct vring_virtqueue *vq, > - unsigned int num) > +static struct vring_desc_extra *vring_alloc_desc_extra(unsigned int num) > { > struct vring_desc_extra *desc_extra; > unsigned int i; > @@ -1755,7 +1754,7 @@ static struct virtqueue *vring_create_virtqueue_packed( > /* Put everything in free lists. */ > vq->free_head = 0; > > - vq->packed.desc_extra = vring_alloc_desc_extra(vq, num); > + vq->packed.desc_extra = vring_alloc_desc_extra(num); > if (!vq->packed.desc_extra) > goto err_desc_extra; > > @@ -2233,7 +2232,7 @@ struct virtqueue *__vring_new_virtqueue(unsigned int index, > if (!vq->split.desc_state) > goto err_state; > > - vq->split.desc_extra = vring_alloc_desc_extra(vq, vring.num); > + vq->split.desc_extra = vring_alloc_desc_extra(vring.num); > if (!vq->split.desc_extra) > goto err_extra; >
diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c index f1807f6b06a5..cb6010750a94 100644 --- a/drivers/virtio/virtio_ring.c +++ b/drivers/virtio/virtio_ring.c @@ -1636,8 +1636,7 @@ static void *virtqueue_detach_unused_buf_packed(struct virtqueue *_vq) return NULL; } -static struct vring_desc_extra *vring_alloc_desc_extra(struct vring_virtqueue *vq, - unsigned int num) +static struct vring_desc_extra *vring_alloc_desc_extra(unsigned int num) { struct vring_desc_extra *desc_extra; unsigned int i; @@ -1755,7 +1754,7 @@ static struct virtqueue *vring_create_virtqueue_packed( /* Put everything in free lists. */ vq->free_head = 0; - vq->packed.desc_extra = vring_alloc_desc_extra(vq, num); + vq->packed.desc_extra = vring_alloc_desc_extra(num); if (!vq->packed.desc_extra) goto err_desc_extra; @@ -2233,7 +2232,7 @@ struct virtqueue *__vring_new_virtqueue(unsigned int index, if (!vq->split.desc_state) goto err_state; - vq->split.desc_extra = vring_alloc_desc_extra(vq, vring.num); + vq->split.desc_extra = vring_alloc_desc_extra(vring.num); if (!vq->split.desc_extra) goto err_extra;
The parameter vq of vring_alloc_desc_extra() is useless. This patch removes this parameter. Subsequent patches will call this function to avoid passing useless arguments. Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com> --- drivers/virtio/virtio_ring.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)