iommu: Remove unused argument in is_attach_deferred

The is_attach_deferred iommu_ops callback is a device op. The domain
argument is unnecessary and never used. Remove it to make code clean.

Suggested-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Link: https://lore.kernel.org/r/20220216025249.3459465-9-baolu.lu@linux.intel.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>

diff --git a/drivers/iommu/amd/amd_iommu.h b/drivers/iommu/amd/amd_iommu.h
index 416815a525d671916a896297b67b28006bb03236..3b2f06b7aca68d3c858bbc2c0e3fc0ea7c9e0c6a 100644 (file)
--- a/drivers/iommu/amd/amd_iommu.h
+++ b/drivers/iommu/amd/amd_iommu.h
@@ -116,8 +116,7 @@ void amd_iommu_domain_clr_pt_root(struct protection_domain *domain)
 
 
 extern bool translation_pre_enabled(struct amd_iommu *iommu);
-extern bool amd_iommu_is_attach_deferred(struct iommu_domain *domain,
-                                        struct device *dev);
+extern bool amd_iommu_is_attach_deferred(struct device *dev);
 extern int __init add_special_device(u8 type, u8 id, u16 *devid,
                                     bool cmd_line);
 

diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c
index 461f1844ed1fbd6f7904055ab7d4facc9bf90982..37f2fbb4b12954f4c97cf745858ebcda8b33d016 100644 (file)
--- a/drivers/iommu/amd/iommu.c
+++ b/drivers/iommu/amd/iommu.c
@@ -2215,8 +2215,7 @@ static void amd_iommu_get_resv_regions(struct device *dev,
        list_add_tail(&region->list, head);
 }
 
-bool amd_iommu_is_attach_deferred(struct iommu_domain *domain,
-                                 struct device *dev)
+bool amd_iommu_is_attach_deferred(struct device *dev)
 {
        struct iommu_dev_data *dev_data = dev_iommu_priv_get(dev);
 

diff --git a/drivers/iommu/amd/iommu_v2.c b/drivers/iommu/amd/iommu_v2.c
index 58da08cc3d01606af7932b63de41bca7e3b3bd53..7c94ec05d2897ffca5b5d4d294ef612dd3334b22 100644 (file)
--- a/drivers/iommu/amd/iommu_v2.c
+++ b/drivers/iommu/amd/iommu_v2.c
@@ -537,7 +537,7 @@ static int ppr_notifier(struct notifier_block *nb, unsigned long e, void *data)
        ret = NOTIFY_DONE;
 
        /* In kdump kernel pci dev is not initialized yet -> send INVALID */
-       if (amd_iommu_is_attach_deferred(NULL, &pdev->dev)) {
+       if (amd_iommu_is_attach_deferred(&pdev->dev)) {
                amd_iommu_complete_ppr(pdev, iommu_fault->pasid,
                                       PPR_INVALID, tag);
                goto out;

diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
index 2b5f4e57a8bb154d74e3101543a8a01a5e36aaa8..80f1294be634ab3bd2d6142cc04fe3129c7e956d 100644 (file)
--- a/drivers/iommu/intel/iommu.c
+++ b/drivers/iommu/intel/iommu.c
@@ -5052,8 +5052,7 @@ intel_iommu_dev_disable_feat(struct device *dev, enum iommu_dev_features feat)
        }
 }
 
-static bool intel_iommu_is_attach_deferred(struct iommu_domain *domain,
-                                          struct device *dev)
+static bool intel_iommu_is_attach_deferred(struct device *dev)
 {
        return attach_deferred(dev);
 }

diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 7af0ee670deb7e51244a0a337d0814fddfb0ffe0..27276421d2532fdee6d81074738b871f13696e16 100644 (file)
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -831,13 +831,12 @@ out:
        return ret;
 }
 
-static bool iommu_is_attach_deferred(struct iommu_domain *domain,
-                                    struct device *dev)
+static bool iommu_is_attach_deferred(struct device *dev)
 {
        const struct iommu_ops *ops = dev_iommu_ops(dev);
 
        if (ops->is_attach_deferred)
-               return ops->is_attach_deferred(domain, dev);
+               return ops->is_attach_deferred(dev);
 
        return false;
 }
@@ -894,7 +893,7 @@ rename:
 
        mutex_lock(&group->mutex);
        list_add_tail(&device->list, &group->devices);
-       if (group->domain  && !iommu_is_attach_deferred(group->domain, dev))
+       if (group->domain  && !iommu_is_attach_deferred(dev))
                ret = __iommu_attach_device(group->domain, dev);
        mutex_unlock(&group->mutex);
        if (ret)
@@ -1745,7 +1744,7 @@ static int iommu_group_do_dma_attach(struct device *dev, void *data)
        struct iommu_domain *domain = data;
        int ret = 0;
 
-       if (!iommu_is_attach_deferred(domain, dev))
+       if (!iommu_is_attach_deferred(dev))
                ret = __iommu_attach_device(domain, dev);
 
        return ret;
@@ -2020,9 +2019,7 @@ EXPORT_SYMBOL_GPL(iommu_attach_device);
 
 int iommu_deferred_attach(struct device *dev, struct iommu_domain *domain)
 {
-       const struct iommu_ops *ops = dev_iommu_ops(dev);
-
-       if (ops->is_attach_deferred && ops->is_attach_deferred(domain, dev))
+       if (iommu_is_attach_deferred(dev))
                return __iommu_attach_device(domain, dev);
 
        return 0;
@@ -2031,7 +2028,7 @@ int iommu_deferred_attach(struct device *dev, struct iommu_domain *domain)
 static void __iommu_detach_device(struct iommu_domain *domain,
                                  struct device *dev)
 {
-       if (iommu_is_attach_deferred(domain, dev))
+       if (iommu_is_attach_deferred(dev))
                return;
 
        if (unlikely(domain->ops->detach_dev == NULL))

diff --git a/include/linux/iommu.h b/include/linux/iommu.h
index 90f1b5e3809d0423f43de08cd015bd065b1dbb02..1ded6076a75cd1ccf8b1201f300c8a517410abfc 100644 (file)
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@ -269,7 +269,7 @@ struct iommu_ops {
        void (*put_resv_regions)(struct device *dev, struct list_head *list);
 
        int (*of_xlate)(struct device *dev, struct of_phandle_args *args);
-       bool (*is_attach_deferred)(struct iommu_domain *domain, struct device *dev);
+       bool (*is_attach_deferred)(struct device *dev);
 
        /* Per device IOMMU features */
        bool (*dev_has_feat)(struct device *dev, enum iommu_dev_features f);