Merge tag 'char-misc-5.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk...

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

diff --git a/drivers/iommu/fsl_pamu_domain.c b/drivers/iommu/fsl_pamu_domain.c
index e9c1e0d..a47f473 100644 (file)
--- a/drivers/iommu/fsl_pamu_domain.c
+++ b/drivers/iommu/fsl_pamu_domain.c
@@ -57,14 +57,13 @@ static int __init iommu_init_mempool(void)
 static int update_liodn_stash(int liodn, struct fsl_dma_domain *dma_domain,
                              u32 val)
 {
-       int ret = 0, i;
+       int ret = 0;
        unsigned long flags;
 
        spin_lock_irqsave(&iommu_lock, flags);
        ret = pamu_update_paace_stash(liodn, val);
        if (ret) {
-               pr_debug("Failed to update SPAACE %d field for liodn %d\n ",
-                        i, liodn);
+               pr_debug("Failed to update SPAACE for liodn %d\n ", liodn);
                spin_unlock_irqrestore(&iommu_lock, flags);
                return ret;
        }
@@ -78,8 +77,6 @@ static int update_liodn_stash(int liodn, struct fsl_dma_domain *dma_domain,
 static int pamu_set_liodn(struct fsl_dma_domain *dma_domain, struct device *dev,
                          int liodn)
 {
-       struct iommu_domain *domain = &dma_domain->iommu_domain;
-       struct iommu_domain_geometry *geom = &domain->geometry;
        u32 omi_index = ~(u32)0;
        unsigned long flags;
        int ret;
@@ -95,14 +92,10 @@ static int pamu_set_liodn(struct fsl_dma_domain *dma_domain, struct device *dev,
        ret = pamu_disable_liodn(liodn);
        if (ret)
                goto out_unlock;
-       ret = pamu_config_ppaace(liodn, geom->aperture_start,
-                                geom->aperture_end + 1, omi_index, 0,
-                                ~(u32)0, dma_domain->stash_id, 0);
+       ret = pamu_config_ppaace(liodn, omi_index, dma_domain->stash_id, 0);
        if (ret)
                goto out_unlock;
-       ret = pamu_config_ppaace(liodn, geom->aperture_start,
-                                geom->aperture_end + 1, ~(u32)0,
-                                0, ~(u32)0, dma_domain->stash_id,
+       ret = pamu_config_ppaace(liodn, ~(u32)0, dma_domain->stash_id,
                                 PAACE_AP_PERMS_QUERY | PAACE_AP_PERMS_UPDATE);
 out_unlock:
        spin_unlock_irqrestore(&iommu_lock, flags);
@@ -481,9 +474,7 @@ int __init pamu_domain_init(void)
        if (ret)
                return ret;
 
-       iommu_device_set_ops(&pamu_iommu, &fsl_pamu_ops);
-
-       ret = iommu_device_register(&pamu_iommu);
+       ret = iommu_device_register(&pamu_iommu, &fsl_pamu_ops, NULL);
        if (ret) {
                iommu_device_sysfs_remove(&pamu_iommu);
                pr_err("Can't register iommu device\n");