Merge tag 'block-5.13-2021-05-07' of git://git.kernel.dk/linux-block

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

diff --git a/drivers/iommu/omap-iommu.c b/drivers/iommu/omap-iommu.c
index 71f29c0..26e517e 100644 (file)
--- a/drivers/iommu/omap-iommu.c
+++ b/drivers/iommu/omap-iommu.c
@@ -1235,10 +1235,7 @@ static int omap_iommu_probe(struct platform_device *pdev)
                if (err)
                        goto out_group;
 
-               iommu_device_set_ops(&obj->iommu, &omap_iommu_ops);
-               iommu_device_set_fwnode(&obj->iommu, &of->fwnode);
-
-               err = iommu_device_register(&obj->iommu);
+               err = iommu_device_register(&obj->iommu, &omap_iommu_ops, &pdev->dev);
                if (err)
                        goto out_sysfs;
        }