---
  drivers/virtio/virtio_ring.c | 17 ++++++++---------
  1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
index 962f1477b1fa..7cf3ae057833 100644
--- a/drivers/virtio/virtio_ring.c
+++ b/drivers/virtio/virtio_ring.c

@@ -984,24 +984,24 @@ static struct virtqueue *vring_create_virtqueue_split(
   * Packed ring specific functions - *_packed().
   */
  
-static void vring_unmap_state_packed(const struct vring_virtqueue *vq,
-				     struct vring_desc_extra *state)
+static void vring_unmap_extra_packed(const struct vring_virtqueue *vq,
+				     struct vring_desc_extra *extra)
  {
  	u16 flags;
  
  	if (!vq->use_dma_api)
  		return;
  
-	flags = state->flags;
+	flags = extra->flags;
  
  	if (flags & VRING_DESC_F_INDIRECT) {
  		dma_unmap_single(vring_dma_dev(vq),
-				 state->addr, state->len,
+				 extra->addr, extra->len,
  				 (flags & VRING_DESC_F_WRITE) ?
  				 DMA_FROM_DEVICE : DMA_TO_DEVICE);
  	} else {
  		dma_unmap_page(vring_dma_dev(vq),
-			       state->addr, state->len,
+			       extra->addr, extra->len,
  			       (flags & VRING_DESC_F_WRITE) ?
  			       DMA_FROM_DEVICE : DMA_TO_DEVICE);
  	}

@@ -1303,8 +1303,7 @@ static inline int virtqueue_add_packed(struct virtqueue *_vq,
  	for (n = 0; n < total_sg; n++) {
  		if (i == err_idx)
  			break;
-		vring_unmap_state_packed(vq,
-					 &vq->packed.desc_extra[curr]);
+		vring_unmap_extra_packed(vq, &vq->packed.desc_extra[curr]);
  		curr = vq->packed.desc_extra[curr].next;
  		i++;
  		if (i >= vq->packed.vring.num)

@@ -1383,8 +1382,8 @@ static void detach_buf_packed(struct vring_virtqueue *vq,
  	if (unlikely(vq->use_dma_api)) {
  		curr = id;
  		for (i = 0; i < state->num; i++) {
-			vring_unmap_state_packed(vq,
-				&vq->packed.desc_extra[curr]);
+			vring_unmap_extra_packed(vq,
+						 &vq->packed.desc_extra[curr]);
  			curr = vq->packed.desc_extra[curr].next;
  		}
  	}