瀏覽代碼

virtio: Use the sg_phys convenience function.

Simple cleanup.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Rusty Russell 17 年之前
父節點
當前提交
15f9c8903c
共有 1 個文件被更改,包括 2 次插入4 次删除
  1. 2 4
      drivers/virtio/virtio_ring.c

+ 2 - 4
drivers/virtio/virtio_ring.c

@@ -99,16 +99,14 @@ static int vring_add_buf(struct virtqueue *_vq,
 	head = vq->free_head;
 	head = vq->free_head;
 	for (i = vq->free_head; out; i = vq->vring.desc[i].next, out--) {
 	for (i = vq->free_head; out; i = vq->vring.desc[i].next, out--) {
 		vq->vring.desc[i].flags = VRING_DESC_F_NEXT;
 		vq->vring.desc[i].flags = VRING_DESC_F_NEXT;
-		vq->vring.desc[i].addr = (page_to_pfn(sg_page(sg))<<PAGE_SHIFT)
-			+ sg->offset;
+		vq->vring.desc[i].addr = sg_phys(sg);
 		vq->vring.desc[i].len = sg->length;
 		vq->vring.desc[i].len = sg->length;
 		prev = i;
 		prev = i;
 		sg++;
 		sg++;
 	}
 	}
 	for (; in; i = vq->vring.desc[i].next, in--) {
 	for (; in; i = vq->vring.desc[i].next, in--) {
 		vq->vring.desc[i].flags = VRING_DESC_F_NEXT|VRING_DESC_F_WRITE;
 		vq->vring.desc[i].flags = VRING_DESC_F_NEXT|VRING_DESC_F_WRITE;
-		vq->vring.desc[i].addr = (page_to_pfn(sg_page(sg))<<PAGE_SHIFT)
-			+ sg->offset;
+		vq->vring.desc[i].addr = sg_phys(sg);
 		vq->vring.desc[i].len = sg->length;
 		vq->vring.desc[i].len = sg->length;
 		prev = i;
 		prev = i;
 		sg++;
 		sg++;