diff options
| author | Joerg Roedel <jroedel@suse.de> | 2017-01-30 18:01:16 +0300 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2017-01-30 18:01:16 +0300 |
| commit | aac7d39f200de84c511f79d9e9da286e1288f176 (patch) | |
| tree | 52045d1755acf0dd43b03a46e4c39b3f22991c82 /drivers/iommu/of_iommu.c | |
| parent | 566cf877a1fcb6d6dc0126b076aad062054c2637 (diff) | |
| parent | 3677a649a751c8f061ba379a98c369473ccac980 (diff) | |
| download | linux-aac7d39f200de84c511f79d9e9da286e1288f176.tar.xz | |
Merge branch 'for-joerg/arm-smmu/updates' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into arm/smmu
Diffstat (limited to 'drivers/iommu/of_iommu.c')
| -rw-r--r-- | drivers/iommu/of_iommu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/iommu/of_iommu.c b/drivers/iommu/of_iommu.c index 0f57ddc4ecc2..d7f480a52736 100644 --- a/drivers/iommu/of_iommu.c +++ b/drivers/iommu/of_iommu.c @@ -127,7 +127,7 @@ static const struct iommu_ops "iommu-map-mask", &iommu_spec.np, iommu_spec.args)) return NULL; - ops = of_iommu_get_ops(iommu_spec.np); + ops = iommu_get_instance(&iommu_spec.np->fwnode); if (!ops || !ops->of_xlate || iommu_fwspec_init(&pdev->dev, &iommu_spec.np->fwnode, ops) || ops->of_xlate(&pdev->dev, &iommu_spec)) @@ -157,7 +157,7 @@ const struct iommu_ops *of_iommu_configure(struct device *dev, "#iommu-cells", idx, &iommu_spec)) { np = iommu_spec.np; - ops = of_iommu_get_ops(np); + ops = iommu_get_instance(&np->fwnode); if (!ops || !ops->of_xlate || iommu_fwspec_init(dev, &np->fwnode, ops) || |