iommu/mediatek: Convert to probe/release_device() call-backs

Convert the Mediatek IOMMU driver to use the probe_device() and
release_device() call-backs of iommu_ops, so that the iommu core code
does the group and sysfs setup.

Signed-off-by: Joerg Roedel <jroedel@suse.de>
Link: https://lore.kernel.org/r/20200429133712.31431-23-joro@8bytes.org
Signed-off-by: Joerg Roedel <jroedel@suse.de>

diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c
index 5f4d6df59cf6b551954c4bf3cb1c67a79a40d8ac..2be96f1cdbd270ba15cc1fe121ca3f96a93ad4d3 100644 (file)
--- a/drivers/iommu/mtk_iommu.c
+++ b/drivers/iommu/mtk_iommu.c
@@ -441,38 +441,26 @@ static phys_addr_t mtk_iommu_iova_to_phys(struct iommu_domain *domain,
        return pa;
 }
 
-static int mtk_iommu_add_device(struct device *dev)
+static struct iommu_device *mtk_iommu_probe_device(struct device *dev)
 {
        struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
        struct mtk_iommu_data *data;
-       struct iommu_group *group;
 
        if (!fwspec || fwspec->ops != &mtk_iommu_ops)
-               return -ENODEV; /* Not a iommu client device */
+               return ERR_PTR(-ENODEV); /* Not a iommu client device */
 
        data = dev_iommu_priv_get(dev);
-       iommu_device_link(&data->iommu, dev);
 
-       group = iommu_group_get_for_dev(dev);
-       if (IS_ERR(group))
-               return PTR_ERR(group);
-
-       iommu_group_put(group);
-       return 0;
+       return &data->iommu;
 }
 
-static void mtk_iommu_remove_device(struct device *dev)
+static void mtk_iommu_release_device(struct device *dev)
 {
        struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
-       struct mtk_iommu_data *data;
 
        if (!fwspec || fwspec->ops != &mtk_iommu_ops)
                return;
 
-       data = dev_iommu_priv_get(dev);
-       iommu_device_unlink(&data->iommu, dev);
-
-       iommu_group_remove_device(dev);
        iommu_fwspec_free(dev);
 }
 
@@ -526,8 +514,8 @@ static const struct iommu_ops mtk_iommu_ops = {
        .flush_iotlb_all = mtk_iommu_flush_iotlb_all,
        .iotlb_sync     = mtk_iommu_iotlb_sync,
        .iova_to_phys   = mtk_iommu_iova_to_phys,
-       .add_device     = mtk_iommu_add_device,
-       .remove_device  = mtk_iommu_remove_device,
+       .probe_device   = mtk_iommu_probe_device,
+       .release_device = mtk_iommu_release_device,
        .device_group   = mtk_iommu_device_group,
        .of_xlate       = mtk_iommu_of_xlate,
        .pgsize_bitmap  = SZ_4K | SZ_64K | SZ_1M | SZ_16M,