diff options
| author | Joerg Roedel <joerg.roedel@amd.com> | 2010-01-20 08:52:23 -0500 |
|---|---|---|
| committer | Joerg Roedel <joerg.roedel@amd.com> | 2010-03-07 12:01:11 -0500 |
| commit | 4abc14a733f9002c05623db755aaafdd27fa7a91 (patch) | |
| tree | 0fd549edf79ba6df91ab6c601521270b937aaebb /drivers | |
| parent | d2be1651b736002e0c76d7095d6c0ba77b4a897c (diff) | |
iommu-api: Rename ->{un}map function pointers to ->{un}map_range
The new function pointer names match better with the
top-level functions of the iommu-api which are using them.
Main intention of this change is to make the ->{un}map
pointer names free for two new mapping functions.
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/base/iommu.c | 4 | ||||
| -rw-r--r-- | drivers/pci/intel-iommu.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/base/iommu.c b/drivers/base/iommu.c index 8ad4ffea6920..f4c86c429297 100644 --- a/drivers/base/iommu.c +++ b/drivers/base/iommu.c | |||
| @@ -83,14 +83,14 @@ EXPORT_SYMBOL_GPL(iommu_detach_device); | |||
| 83 | int iommu_map_range(struct iommu_domain *domain, unsigned long iova, | 83 | int iommu_map_range(struct iommu_domain *domain, unsigned long iova, |
| 84 | phys_addr_t paddr, size_t size, int prot) | 84 | phys_addr_t paddr, size_t size, int prot) |
| 85 | { | 85 | { |
| 86 | return iommu_ops->map(domain, iova, paddr, size, prot); | 86 | return iommu_ops->map_range(domain, iova, paddr, size, prot); |
| 87 | } | 87 | } |
| 88 | EXPORT_SYMBOL_GPL(iommu_map_range); | 88 | EXPORT_SYMBOL_GPL(iommu_map_range); |
| 89 | 89 | ||
| 90 | void iommu_unmap_range(struct iommu_domain *domain, unsigned long iova, | 90 | void iommu_unmap_range(struct iommu_domain *domain, unsigned long iova, |
| 91 | size_t size) | 91 | size_t size) |
| 92 | { | 92 | { |
| 93 | iommu_ops->unmap(domain, iova, size); | 93 | iommu_ops->unmap_range(domain, iova, size); |
| 94 | } | 94 | } |
| 95 | EXPORT_SYMBOL_GPL(iommu_unmap_range); | 95 | EXPORT_SYMBOL_GPL(iommu_unmap_range); |
| 96 | 96 | ||
diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c index 417312528ddf..a714e3db13c1 100644 --- a/drivers/pci/intel-iommu.c +++ b/drivers/pci/intel-iommu.c | |||
| @@ -3714,8 +3714,8 @@ static struct iommu_ops intel_iommu_ops = { | |||
| 3714 | .domain_destroy = intel_iommu_domain_destroy, | 3714 | .domain_destroy = intel_iommu_domain_destroy, |
| 3715 | .attach_dev = intel_iommu_attach_device, | 3715 | .attach_dev = intel_iommu_attach_device, |
| 3716 | .detach_dev = intel_iommu_detach_device, | 3716 | .detach_dev = intel_iommu_detach_device, |
| 3717 | .map = intel_iommu_map_range, | 3717 | .map_range = intel_iommu_map_range, |
| 3718 | .unmap = intel_iommu_unmap_range, | 3718 | .unmap_range = intel_iommu_unmap_range, |
| 3719 | .iova_to_phys = intel_iommu_iova_to_phys, | 3719 | .iova_to_phys = intel_iommu_iova_to_phys, |
| 3720 | .domain_has_cap = intel_iommu_domain_has_cap, | 3720 | .domain_has_cap = intel_iommu_domain_has_cap, |
| 3721 | }; | 3721 | }; |
