From: Joerg Roedel Date: Wed, 22 Jul 2015 09:58:07 +0000 (+0200) Subject: iommu/vt-d: Only call domain_remove_one_dev_info to detach old domain X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=de7e888646466e6c32cdd41124c0164cfed4abcb;p=linux-beck.git iommu/vt-d: Only call domain_remove_one_dev_info to detach old domain 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 --- diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index 1cb7a3eb29d3..c8d9bef776da 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c @@ -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) &&