提交 7c2aa644 编写于 作者: J Joerg Roedel

iommu/tegra: Convert to iommu_capable() API function

Cc: Hiroshi Doyu <hdoyu@nvidia.com>
Signed-off-by: NJoerg Roedel <jroedel@suse.de>
上级 4480845e
...@@ -303,13 +303,13 @@ static phys_addr_t gart_iommu_iova_to_phys(struct iommu_domain *domain, ...@@ -303,13 +303,13 @@ static phys_addr_t gart_iommu_iova_to_phys(struct iommu_domain *domain,
return pa; return pa;
} }
static int gart_iommu_domain_has_cap(struct iommu_domain *domain, static bool gart_iommu_capable(enum iommu_cap cap)
unsigned long cap)
{ {
return 0; return false;
} }
static const struct iommu_ops gart_iommu_ops = { static const struct iommu_ops gart_iommu_ops = {
.capable = gart_iommu_capable,
.domain_init = gart_iommu_domain_init, .domain_init = gart_iommu_domain_init,
.domain_destroy = gart_iommu_domain_destroy, .domain_destroy = gart_iommu_domain_destroy,
.attach_dev = gart_iommu_attach_dev, .attach_dev = gart_iommu_attach_dev,
...@@ -317,7 +317,6 @@ static const struct iommu_ops gart_iommu_ops = { ...@@ -317,7 +317,6 @@ static const struct iommu_ops gart_iommu_ops = {
.map = gart_iommu_map, .map = gart_iommu_map,
.unmap = gart_iommu_unmap, .unmap = gart_iommu_unmap,
.iova_to_phys = gart_iommu_iova_to_phys, .iova_to_phys = gart_iommu_iova_to_phys,
.domain_has_cap = gart_iommu_domain_has_cap,
.pgsize_bitmap = GART_IOMMU_PGSIZES, .pgsize_bitmap = GART_IOMMU_PGSIZES,
}; };
......
...@@ -780,10 +780,9 @@ static phys_addr_t smmu_iommu_iova_to_phys(struct iommu_domain *domain, ...@@ -780,10 +780,9 @@ static phys_addr_t smmu_iommu_iova_to_phys(struct iommu_domain *domain,
return PFN_PHYS(pfn); return PFN_PHYS(pfn);
} }
static int smmu_iommu_domain_has_cap(struct iommu_domain *domain, static bool smmu_iommu_capable(enum iommu_cap cap)
unsigned long cap)
{ {
return 0; return false;
} }
static int smmu_iommu_attach_dev(struct iommu_domain *domain, static int smmu_iommu_attach_dev(struct iommu_domain *domain,
...@@ -949,6 +948,7 @@ static void smmu_iommu_domain_destroy(struct iommu_domain *domain) ...@@ -949,6 +948,7 @@ static void smmu_iommu_domain_destroy(struct iommu_domain *domain)
} }
static const struct iommu_ops smmu_iommu_ops = { static const struct iommu_ops smmu_iommu_ops = {
.capable = smmu_iommu_capable,
.domain_init = smmu_iommu_domain_init, .domain_init = smmu_iommu_domain_init,
.domain_destroy = smmu_iommu_domain_destroy, .domain_destroy = smmu_iommu_domain_destroy,
.attach_dev = smmu_iommu_attach_dev, .attach_dev = smmu_iommu_attach_dev,
...@@ -956,7 +956,6 @@ static const struct iommu_ops smmu_iommu_ops = { ...@@ -956,7 +956,6 @@ static const struct iommu_ops smmu_iommu_ops = {
.map = smmu_iommu_map, .map = smmu_iommu_map,
.unmap = smmu_iommu_unmap, .unmap = smmu_iommu_unmap,
.iova_to_phys = smmu_iommu_iova_to_phys, .iova_to_phys = smmu_iommu_iova_to_phys,
.domain_has_cap = smmu_iommu_domain_has_cap,
.pgsize_bitmap = SMMU_IOMMU_PGSIZES, .pgsize_bitmap = SMMU_IOMMU_PGSIZES,
}; };
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册