Merge tag 'amd-drm-fixes-5.13-2021-05-19' of https://gitlab.freedesktop.org/agd5f...

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

diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c
index e5d86b7..7a29327 100644 (file)
--- a/drivers/iommu/rockchip-iommu.c
+++ b/drivers/iommu/rockchip-iommu.c
@@ -1196,10 +1196,7 @@ static int rk_iommu_probe(struct platform_device *pdev)
        if (err)
                goto err_put_group;
 
-       iommu_device_set_ops(&iommu->iommu, &rk_iommu_ops);
-       iommu_device_set_fwnode(&iommu->iommu, &dev->of_node->fwnode);
-
-       err = iommu_device_register(&iommu->iommu);
+       err = iommu_device_register(&iommu->iommu, &rk_iommu_ops, dev);
        if (err)
                goto err_remove_sysfs;