diff options
author | Joerg Roedel <joerg.roedel@amd.com> | 2009-11-23 12:44:42 -0500 |
---|---|---|
committer | Joerg Roedel <joerg.roedel@amd.com> | 2009-11-27 08:16:31 -0500 |
commit | 680525e06ddccda8c51bdddf532cd5b7d950c411 (patch) | |
tree | b9b47345713548eb6a0ecf7c8ea66e350c670a42 /arch/x86/kernel/amd_iommu.c | |
parent | f99c0f1c75f75924a6f19cb40a21ccefc6e8754d (diff) |
x86/amd-iommu: Remove iommu parameter from dma_ops_domain_(un)map
The parameter is unused in these function so remove it from
the parameter list.
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Diffstat (limited to 'arch/x86/kernel/amd_iommu.c')
-rw-r--r-- | arch/x86/kernel/amd_iommu.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c index c5102ebdcbd9..da3f9d8ee395 100644 --- a/arch/x86/kernel/amd_iommu.c +++ b/arch/x86/kernel/amd_iommu.c | |||
@@ -1585,8 +1585,7 @@ static u64* dma_ops_get_pte(struct dma_ops_domain *dom, | |||
1585 | * This is the generic map function. It maps one 4kb page at paddr to | 1585 | * This is the generic map function. It maps one 4kb page at paddr to |
1586 | * the given address in the DMA address space for the domain. | 1586 | * the given address in the DMA address space for the domain. |
1587 | */ | 1587 | */ |
1588 | static dma_addr_t dma_ops_domain_map(struct amd_iommu *iommu, | 1588 | static dma_addr_t dma_ops_domain_map(struct dma_ops_domain *dom, |
1589 | struct dma_ops_domain *dom, | ||
1590 | unsigned long address, | 1589 | unsigned long address, |
1591 | phys_addr_t paddr, | 1590 | phys_addr_t paddr, |
1592 | int direction) | 1591 | int direction) |
@@ -1620,8 +1619,7 @@ static dma_addr_t dma_ops_domain_map(struct amd_iommu *iommu, | |||
1620 | /* | 1619 | /* |
1621 | * The generic unmapping function for on page in the DMA address space. | 1620 | * The generic unmapping function for on page in the DMA address space. |
1622 | */ | 1621 | */ |
1623 | static void dma_ops_domain_unmap(struct amd_iommu *iommu, | 1622 | static void dma_ops_domain_unmap(struct dma_ops_domain *dom, |
1624 | struct dma_ops_domain *dom, | ||
1625 | unsigned long address) | 1623 | unsigned long address) |
1626 | { | 1624 | { |
1627 | struct aperture_range *aperture; | 1625 | struct aperture_range *aperture; |
@@ -1700,7 +1698,7 @@ retry: | |||
1700 | 1698 | ||
1701 | start = address; | 1699 | start = address; |
1702 | for (i = 0; i < pages; ++i) { | 1700 | for (i = 0; i < pages; ++i) { |
1703 | ret = dma_ops_domain_map(iommu, dma_dom, start, paddr, dir); | 1701 | ret = dma_ops_domain_map(dma_dom, start, paddr, dir); |
1704 | if (ret == DMA_ERROR_CODE) | 1702 | if (ret == DMA_ERROR_CODE) |
1705 | goto out_unmap; | 1703 | goto out_unmap; |
1706 | 1704 | ||
@@ -1724,7 +1722,7 @@ out_unmap: | |||
1724 | 1722 | ||
1725 | for (--i; i >= 0; --i) { | 1723 | for (--i; i >= 0; --i) { |
1726 | start -= PAGE_SIZE; | 1724 | start -= PAGE_SIZE; |
1727 | dma_ops_domain_unmap(iommu, dma_dom, start); | 1725 | dma_ops_domain_unmap(dma_dom, start); |
1728 | } | 1726 | } |
1729 | 1727 | ||
1730 | dma_ops_free_addresses(dma_dom, address, pages); | 1728 | dma_ops_free_addresses(dma_dom, address, pages); |
@@ -1754,7 +1752,7 @@ static void __unmap_single(struct amd_iommu *iommu, | |||
1754 | start = dma_addr; | 1752 | start = dma_addr; |
1755 | 1753 | ||
1756 | for (i = 0; i < pages; ++i) { | 1754 | for (i = 0; i < pages; ++i) { |
1757 | dma_ops_domain_unmap(iommu, dma_dom, start); | 1755 | dma_ops_domain_unmap(dma_dom, start); |
1758 | start += PAGE_SIZE; | 1756 | start += PAGE_SIZE; |
1759 | } | 1757 | } |
1760 | 1758 | ||