iommu/vt-d: Only call domain_remove_one_dev_info to detach old domain
authorJoerg Roedel <jroedel@suse.de>
Wed, 22 Jul 2015 09:58:07 +0000 (11:58 +0200)
committerJoerg Roedel <jroedel@suse.de>
Wed, 12 Aug 2015 14:23:36 +0000 (16:23 +0200)
There is no need to make a difference here between VM and
non-VM domains, so simplify this code here.

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

index 1cb7a3e..c8d9bef 100644 (file)
@@ -4648,10 +4648,7 @@ static int intel_iommu_attach_device(struct iommu_domain *domain,
                old_domain = find_domain(dev);
                if (old_domain) {
                        rcu_read_lock();
-                       if (domain_type_is_vm_or_si(dmar_domain))
-                               dmar_remove_one_dev_info(old_domain, dev);
-                       else
-                               domain_remove_dev_info(old_domain);
+                       dmar_remove_one_dev_info(old_domain, dev);
                        rcu_read_unlock();
 
                        if (!domain_type_is_vm_or_si(old_domain) &&