Merge tag 'mmc-v4.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc

[sfrench/cifs-2.6.git] / drivers / iommu / exynos-iommu.c

diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c
index c5f4f7691b571d8ef3ba1677d5353ca9a2b31be7..1bd0cd7168dfc92d2dcf7da7c78efc06c78b5f3b 100644 (file)
--- a/drivers/iommu/exynos-iommu.c
+++ b/drivers/iommu/exynos-iommu.c
@@ -1239,17 +1239,6 @@ static phys_addr_t exynos_iommu_iova_to_phys(struct iommu_domain *iommu_domain,
        return phys;
 }
 
-static struct iommu_group *get_device_iommu_group(struct device *dev)
-{
-       struct iommu_group *group;
-
-       group = iommu_group_get(dev);
-       if (!group)
-               group = iommu_group_alloc();
-
-       return group;
-}
-
 static int exynos_iommu_add_device(struct device *dev)
 {
        struct exynos_iommu_owner *owner = dev->archdata.iommu;
@@ -1343,9 +1332,8 @@ static const struct iommu_ops exynos_iommu_ops = {
        .detach_dev = exynos_iommu_detach_device,
        .map = exynos_iommu_map,
        .unmap = exynos_iommu_unmap,
-       .map_sg = default_iommu_map_sg,
        .iova_to_phys = exynos_iommu_iova_to_phys,
-       .device_group = get_device_iommu_group,
+       .device_group = generic_device_group,
        .add_device = exynos_iommu_add_device,
        .remove_device = exynos_iommu_remove_device,
        .pgsize_bitmap = SECT_SIZE | LPAGE_SIZE | SPAGE_SIZE,
@@ -1401,5 +1389,3 @@ err_reg_driver:
        return ret;
 }
 core_initcall(exynos_iommu_init);
-
-IOMMU_OF_DECLARE(exynos_iommu_of, "samsung,exynos-sysmmu");