iommu/vt-d: Simplify domain_remove_dev_info()
authorJoerg Roedel <jroedel@suse.de>
Tue, 21 Jul 2015 16:25:11 +0000 (18:25 +0200)
committerJoerg Roedel <jroedel@suse.de>
Wed, 12 Aug 2015 14:23:35 +0000 (16:23 +0200)
Just call domain_remove_one_dev_info() for all devices in
the domain instead of reimplementing the functionality.

Signed-off-by: Joerg Roedel <jroedel@suse.de>
drivers/iommu/intel-iommu.c

index d241353..c674aa1 100644 (file)
@@ -2253,25 +2253,9 @@ static inline void unlink_domain_info(struct device_domain_info *info)
 static void domain_remove_dev_info(struct dmar_domain *domain)
 {
        struct device_domain_info *info, *tmp;
-       unsigned long flags;
-
-       spin_lock_irqsave(&device_domain_lock, flags);
-       list_for_each_entry_safe(info, tmp, &domain->devices, link) {
-               unlink_domain_info(info);
-               spin_unlock_irqrestore(&device_domain_lock, flags);
-
-               iommu_disable_dev_iotlb(info);
-               iommu_detach_dev(info->iommu, info->bus, info->devfn);
-
-               if (domain_type_is_vm(domain)) {
-                       iommu_detach_dependent_devices(info->iommu, info->dev);
-                       domain_detach_iommu(domain, info->iommu);
-               }
 
-               free_devinfo_mem(info);
-               spin_lock_irqsave(&device_domain_lock, flags);
-       }
-       spin_unlock_irqrestore(&device_domain_lock, flags);
+       list_for_each_entry_safe(info, tmp, &domain->devices, link)
+               domain_remove_one_dev_info(domain, info->dev);
 }
 
 /*