Merge tag 'kbuild-v5.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy...

[linux-2.6-microblaze.git] / drivers / iommu / ipmmu-vmsa.c

diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c
index eaaec0a..aaa6a4d 100644 (file)
--- a/drivers/iommu/ipmmu-vmsa.c
+++ b/drivers/iommu/ipmmu-vmsa.c
@@ -1076,11 +1076,7 @@ static int ipmmu_probe(struct platform_device *pdev)
                if (ret)
                        return ret;
 
-               iommu_device_set_ops(&mmu->iommu, &ipmmu_ops);
-               iommu_device_set_fwnode(&mmu->iommu,
-                                       &pdev->dev.of_node->fwnode);
-
-               ret = iommu_device_register(&mmu->iommu);
+               ret = iommu_device_register(&mmu->iommu, &ipmmu_ops, &pdev->dev);
                if (ret)
                        return ret;