iommu/vt-d: Unwrap __get_valid_domain_for_dev()

We do find_domain() in __get_valid_domain_for_dev(), while we do the
same thing in get_valid_domain_for_dev().  No need to do it twice.

Signed-off-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>

diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index 90ab0115d78e8dcc4512a6ab2efb27ac45a86c54..ee9c258d3ae0c501421f41740a950b613d87b8d3 100644 (file)
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -2387,7 +2387,7 @@ static struct dmar_domain *find_domain(struct device *dev)
 
        /* No lock here, assumes no domain exit in normal case */
        info = dev->archdata.iommu;
-       if (info)
+       if (likely(info))
                return info->domain;
        return NULL;
 }
@@ -3475,7 +3475,7 @@ static unsigned long intel_alloc_iova(struct device *dev,
        return iova_pfn;
 }
 
-static struct dmar_domain *__get_valid_domain_for_dev(struct device *dev)
+static struct dmar_domain *get_valid_domain_for_dev(struct device *dev)
 {
        struct dmar_domain *domain, *tmp;
        struct dmar_rmrr_unit *rmrr;
@@ -3522,18 +3522,6 @@ out:
        return domain;
 }
 
-static inline struct dmar_domain *get_valid_domain_for_dev(struct device *dev)
-{
-       struct device_domain_info *info;
-
-       /* No lock here, assumes no domain exit in normal case */
-       info = dev->archdata.iommu;
-       if (likely(info))
-               return info->domain;
-
-       return __get_valid_domain_for_dev(dev);
-}
-
 /* Check if the dev needs to go through non-identity map and unmap process.*/
 static int iommu_no_mapping(struct device *dev)
 {