Commit fd2e2633 authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by Linus Torvalds
Browse files

alpha: kill deprecated virt_to_bus 



pci-noop.c doesn't use DMA mappings.

Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: Jens Axboe <jens.axboe@oracle.com>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 26a6e661

arch/alpha/kernel/pci-noop.c

+2 −2
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ dma_alloc_coherent(struct device *dev, size_t size, 
	ret = (void *)__get_free_pages(gfp, get_order(size));

	if (ret) {

		memset(ret, 0, size);

		*dma_handle = virt_to_bus(ret);

		*dma_handle = virt_to_phys(ret);

	}

	return ret;

}
@@ -184,7 +184,7 @@ dma_map_sg(struct device *dev, struct scatterlist *sgl, int nents, 


		BUG_ON(!sg_page(sg));

		va = sg_virt(sg);

		sg_dma_address(sg) = (dma_addr_t)virt_to_bus(va);

		sg_dma_address(sg) = (dma_addr_t)virt_to_phys(va);

		sg_dma_len(sg) = sg->length;

	}