Merge tag 'sound-fix-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[linux-beck.git] / drivers / iommu / msm_iommu.c

diff --git a/drivers/iommu/msm_iommu.c b/drivers/iommu/msm_iommu.c
index 49f41d6e02f1de600e6be69afc4d195cc43ca3dd..6e3dcc289d59d49c2cec89a4c0abcba19c3b01bd 100644 (file)
--- a/drivers/iommu/msm_iommu.c
+++ b/drivers/iommu/msm_iommu.c
@@ -603,10 +603,9 @@ fail:
        return ret;
 }
 
-static int msm_iommu_domain_has_cap(struct iommu_domain *domain,
-                                   unsigned long cap)
+static bool msm_iommu_capable(enum iommu_cap cap)
 {
-       return 0;
+       return false;
 }
 
 static void print_ctx_regs(void __iomem *base, int ctx)
@@ -675,6 +674,7 @@ fail:
 }
 
 static const struct iommu_ops msm_iommu_ops = {
+       .capable = msm_iommu_capable,
        .domain_init = msm_iommu_domain_init,
        .domain_destroy = msm_iommu_domain_destroy,
        .attach_dev = msm_iommu_attach_dev,
@@ -682,7 +682,6 @@ static const struct iommu_ops msm_iommu_ops = {
        .map = msm_iommu_map,
        .unmap = msm_iommu_unmap,
        .iova_to_phys = msm_iommu_iova_to_phys,
-       .domain_has_cap = msm_iommu_domain_has_cap,
        .pgsize_bitmap = MSM_IOMMU_PGSIZES,
 };