Commit 71753239 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Joerg Roedel

iommu/vt-d: Remove unused dmar_remove_one_dev_info() argument

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 127c7615 ("iommu/vt-d:
Pass device_domain_info to __dmar_remove_one_dev_info").
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent e083ea5b
...@@ -343,8 +343,7 @@ static int g_num_of_iommus; ...@@ -343,8 +343,7 @@ static int g_num_of_iommus;
static void domain_exit(struct dmar_domain *domain); static void domain_exit(struct dmar_domain *domain);
static void domain_remove_dev_info(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, static void dmar_remove_one_dev_info(struct device *dev);
struct device *dev);
static void __dmar_remove_one_dev_info(struct device_domain_info *info); static void __dmar_remove_one_dev_info(struct device_domain_info *info);
static void domain_context_clear(struct intel_iommu *iommu, static void domain_context_clear(struct intel_iommu *iommu,
struct device *dev); struct device *dev);
...@@ -2546,7 +2545,7 @@ static struct dmar_domain *dmar_insert_one_dev_info(struct intel_iommu *iommu, ...@@ -2546,7 +2545,7 @@ static struct dmar_domain *dmar_insert_one_dev_info(struct intel_iommu *iommu,
ret = intel_pasid_alloc_table(dev); ret = intel_pasid_alloc_table(dev);
if (ret) { if (ret) {
dev_err(dev, "PASID table allocation failed\n"); dev_err(dev, "PASID table allocation failed\n");
dmar_remove_one_dev_info(domain, dev); dmar_remove_one_dev_info(dev);
return NULL; return NULL;
} }
...@@ -2561,14 +2560,14 @@ static struct dmar_domain *dmar_insert_one_dev_info(struct intel_iommu *iommu, ...@@ -2561,14 +2560,14 @@ static struct dmar_domain *dmar_insert_one_dev_info(struct intel_iommu *iommu,
spin_unlock(&iommu->lock); spin_unlock(&iommu->lock);
if (ret) { if (ret) {
dev_err(dev, "Setup RID2PASID failed\n"); dev_err(dev, "Setup RID2PASID failed\n");
dmar_remove_one_dev_info(domain, dev); dmar_remove_one_dev_info(dev);
return NULL; return NULL;
} }
} }
if (dev && domain_context_mapping(domain, dev)) { if (dev && domain_context_mapping(domain, dev)) {
dev_err(dev, "Domain context map failed\n"); dev_err(dev, "Domain context map failed\n");
dmar_remove_one_dev_info(domain, dev); dmar_remove_one_dev_info(dev);
return NULL; return NULL;
} }
...@@ -3621,7 +3620,7 @@ static int iommu_no_mapping(struct device *dev) ...@@ -3621,7 +3620,7 @@ static int iommu_no_mapping(struct device *dev)
* 32 bit DMA is removed from si_domain and fall back * 32 bit DMA is removed from si_domain and fall back
* to non-identity mapping. * 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"); dev_info(dev, "32bit DMA uses non-identity mapping\n");
return 0; return 0;
} }
...@@ -4576,7 +4575,7 @@ static int device_notifier(struct notifier_block *nb, ...@@ -4576,7 +4575,7 @@ static int device_notifier(struct notifier_block *nb,
if (!domain) if (!domain)
return 0; 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)) if (!domain_type_is_vm_or_si(domain) && list_empty(&domain->devices))
domain_exit(domain); domain_exit(domain);
...@@ -4989,8 +4988,7 @@ static void __dmar_remove_one_dev_info(struct device_domain_info *info) ...@@ -4989,8 +4988,7 @@ static void __dmar_remove_one_dev_info(struct device_domain_info *info)
free_devinfo_mem(info); free_devinfo_mem(info);
} }
static void dmar_remove_one_dev_info(struct dmar_domain *domain, static void dmar_remove_one_dev_info(struct device *dev)
struct device *dev)
{ {
struct device_domain_info *info; struct device_domain_info *info;
unsigned long flags; unsigned long flags;
...@@ -5079,7 +5077,7 @@ static int intel_iommu_attach_device(struct iommu_domain *domain, ...@@ -5079,7 +5077,7 @@ static int intel_iommu_attach_device(struct iommu_domain *domain,
old_domain = find_domain(dev); old_domain = find_domain(dev);
if (old_domain) { if (old_domain) {
rcu_read_lock(); rcu_read_lock();
dmar_remove_one_dev_info(old_domain, dev); dmar_remove_one_dev_info(dev);
rcu_read_unlock(); rcu_read_unlock();
if (!domain_type_is_vm_or_si(old_domain) && if (!domain_type_is_vm_or_si(old_domain) &&
...@@ -5126,7 +5124,7 @@ static int intel_iommu_attach_device(struct iommu_domain *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, static void intel_iommu_detach_device(struct iommu_domain *domain,
struct device *dev) 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, static int intel_iommu_map(struct iommu_domain *domain,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment