diff options
author | Joerg Roedel <jroedel@suse.de> | 2014-09-05 04:51:14 -0400 |
---|---|---|
committer | Joerg Roedel <jroedel@suse.de> | 2014-09-25 09:47:38 -0400 |
commit | 4480845eef8d7751f015322e3c6d2680ff7d7dc7 (patch) | |
tree | ddfdc0ae06d9ea67e7f77b569150b14188608253 /drivers | |
parent | 5d587b8de56eec6c6a31b452a177cd8c066b267e (diff) |
iommu/msm: Convert to iommu_capable() API function
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/iommu/msm_iommu.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/iommu/msm_iommu.c b/drivers/iommu/msm_iommu.c index 49f41d6e02f1..6e3dcc289d59 100644 --- a/drivers/iommu/msm_iommu.c +++ b/drivers/iommu/msm_iommu.c | |||
@@ -603,10 +603,9 @@ fail: | |||
603 | return ret; | 603 | return ret; |
604 | } | 604 | } |
605 | 605 | ||
606 | static int msm_iommu_domain_has_cap(struct iommu_domain *domain, | 606 | static bool msm_iommu_capable(enum iommu_cap cap) |
607 | unsigned long cap) | ||
608 | { | 607 | { |
609 | return 0; | 608 | return false; |
610 | } | 609 | } |
611 | 610 | ||
612 | static void print_ctx_regs(void __iomem *base, int ctx) | 611 | static void print_ctx_regs(void __iomem *base, int ctx) |
@@ -675,6 +674,7 @@ fail: | |||
675 | } | 674 | } |
676 | 675 | ||
677 | static const struct iommu_ops msm_iommu_ops = { | 676 | static const struct iommu_ops msm_iommu_ops = { |
677 | .capable = msm_iommu_capable, | ||
678 | .domain_init = msm_iommu_domain_init, | 678 | .domain_init = msm_iommu_domain_init, |
679 | .domain_destroy = msm_iommu_domain_destroy, | 679 | .domain_destroy = msm_iommu_domain_destroy, |
680 | .attach_dev = msm_iommu_attach_dev, | 680 | .attach_dev = msm_iommu_attach_dev, |
@@ -682,7 +682,6 @@ static const struct iommu_ops msm_iommu_ops = { | |||
682 | .map = msm_iommu_map, | 682 | .map = msm_iommu_map, |
683 | .unmap = msm_iommu_unmap, | 683 | .unmap = msm_iommu_unmap, |
684 | .iova_to_phys = msm_iommu_iova_to_phys, | 684 | .iova_to_phys = msm_iommu_iova_to_phys, |
685 | .domain_has_cap = msm_iommu_domain_has_cap, | ||
686 | .pgsize_bitmap = MSM_IOMMU_PGSIZES, | 685 | .pgsize_bitmap = MSM_IOMMU_PGSIZES, |
687 | }; | 686 | }; |
688 | 687 | ||