OSDN Git Service

iommu/vt-d: Remove unused dmar_remove_one_dev_info() argument
authorBjorn Helgaas <bhelgaas@google.com>
Fri, 8 Feb 2019 22:06:15 +0000 (16:06 -0600)
committerJoerg Roedel <jroedel@suse.de>
Mon, 11 Feb 2019 11:07:06 +0000 (12:07 +0100)
domain_remove_dev_info() takes a struct dmar_domain * argument, but doesn't
use it.  Remove it.  No functional change intended.

The last use of this argument was removed by 127c761598f7 ("iommu/vt-d:
Pass device_domain_info to __dmar_remove_one_dev_info").

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
drivers/iommu/intel-iommu.c

index a27c0db..e069134 100644 (file)
@@ -343,8 +343,7 @@ static int g_num_of_iommus;
 
 static void domain_exit(struct dmar_domain *domain);
 static void domain_remove_dev_info(struct dmar_domain *domain);
-static void dmar_remove_one_dev_info(struct dmar_domain *domain,
-                                    struct device *dev);
+static void dmar_remove_one_dev_info(struct device *dev);
 static void __dmar_remove_one_dev_info(struct device_domain_info *info);
 static void domain_context_clear(struct intel_iommu *iommu,
                                 struct device *dev);
@@ -2546,7 +2545,7 @@ static struct dmar_domain *dmar_insert_one_dev_info(struct intel_iommu *iommu,
                ret = intel_pasid_alloc_table(dev);
                if (ret) {
                        dev_err(dev, "PASID table allocation failed\n");
-                       dmar_remove_one_dev_info(domain, dev);
+                       dmar_remove_one_dev_info(dev);
                        return NULL;
                }
 
@@ -2561,14 +2560,14 @@ static struct dmar_domain *dmar_insert_one_dev_info(struct intel_iommu *iommu,
                spin_unlock(&iommu->lock);
                if (ret) {
                        dev_err(dev, "Setup RID2PASID failed\n");
-                       dmar_remove_one_dev_info(domain, dev);
+                       dmar_remove_one_dev_info(dev);
                        return NULL;
                }
        }
 
        if (dev && domain_context_mapping(domain, dev)) {
                dev_err(dev, "Domain context map failed\n");
-               dmar_remove_one_dev_info(domain, dev);
+               dmar_remove_one_dev_info(dev);
                return NULL;
        }
 
@@ -3621,7 +3620,7 @@ static int iommu_no_mapping(struct device *dev)
                         * 32 bit DMA is removed from si_domain and fall back
                         * to non-identity mapping.
                         */
-                       dmar_remove_one_dev_info(si_domain, dev);
+                       dmar_remove_one_dev_info(dev);
                        dev_info(dev, "32bit DMA uses non-identity mapping\n");
                        return 0;
                }
@@ -4576,7 +4575,7 @@ static int device_notifier(struct notifier_block *nb,
        if (!domain)
                return 0;
 
-       dmar_remove_one_dev_info(domain, dev);
+       dmar_remove_one_dev_info(dev);
        if (!domain_type_is_vm_or_si(domain) && list_empty(&domain->devices))
                domain_exit(domain);
 
@@ -4989,8 +4988,7 @@ static void __dmar_remove_one_dev_info(struct device_domain_info *info)
        free_devinfo_mem(info);
 }
 
-static void dmar_remove_one_dev_info(struct dmar_domain *domain,
-                                    struct device *dev)
+static void dmar_remove_one_dev_info(struct device *dev)
 {
        struct device_domain_info *info;
        unsigned long flags;
@@ -5079,7 +5077,7 @@ static int intel_iommu_attach_device(struct iommu_domain *domain,
                old_domain = find_domain(dev);
                if (old_domain) {
                        rcu_read_lock();
-                       dmar_remove_one_dev_info(old_domain, dev);
+                       dmar_remove_one_dev_info(dev);
                        rcu_read_unlock();
 
                        if (!domain_type_is_vm_or_si(old_domain) &&
@@ -5126,7 +5124,7 @@ static int intel_iommu_attach_device(struct iommu_domain *domain,
 static void intel_iommu_detach_device(struct iommu_domain *domain,
                                      struct device *dev)
 {
-       dmar_remove_one_dev_info(to_dmar_domain(domain), dev);
+       dmar_remove_one_dev_info(dev);
 }
 
 static int intel_iommu_map(struct iommu_domain *domain,