lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86: remove map_single and unmap_single in struct dma_mapping_ops

Browse Source 
This patch converts dma_map_single and dma_unmap_single to use
map_page and unmap_page respectively and removes unnecessary
map_single and unmap_single in struct dma_mapping_ops.

This leaves intel-iommu's dma_map_single and dma_unmap_single since
IA64 uses them. They will be removed after the unification.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
FUJITA Tomonori
2009-01-05 23:47:28 +09:00
committed by Ingo Molnar
parent 33feffd452
commit d7dff84053
7 changed files with 8 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
arch/x86/kernel/amd_iommu.c
View File

@@ -1341,13 +1341,6 @@ out:
return addr;
}
static dma_addr_t map_single(struct device *dev, phys_addr_t paddr,
size_t size, int dir)
{
return map_page(dev, pfn_to_page(paddr >> PAGE_SHIFT),
paddr & ~PAGE_MASK, size, dir, NULL);
}
/*
* The exported unmap_single function for dma_ops.
*/
@@ -1378,12 +1371,6 @@ static void unmap_page(struct device *dev, dma_addr_t dma_addr, size_t size,
spin_unlock_irqrestore(&domain->lock, flags);
}
static void unmap_single(struct device *dev, dma_addr_t dma_addr,
size_t size, int dir)
{
return unmap_page(dev, dma_addr, size, dir, NULL);
}
/*
* This is a special map_sg function which is used if we should map a
* device which is not handled by an AMD IOMMU in the system.
@@ -1664,8 +1651,6 @@ static void prealloc_protection_domains(void)
static struct dma_mapping_ops amd_iommu_dma_ops = {
.alloc_coherent = alloc_coherent,
.free_coherent = free_coherent,
.map_single = map_single,
.unmap_single = unmap_single,
.map_page = map_page,
.unmap_page = unmap_page,
.map_sg = map_sg,