lkml.org 
[lkml]   [2020]   [Feb]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 5.5 005/150] iommu/vt-d: Remove deferred_attach_domain()
Date
From: Joerg Roedel <jroedel@suse.de>

commit 96d170f3b1a607612caf3618c534d5c64fc2d61b upstream.

The function is now only a wrapper around find_domain(). Remove the
function and call find_domain() directly at the call-sites.

Fixes: 1ee0186b9a12 ("iommu/vt-d: Refactor find_domain() helper")
Cc: stable@vger.kernel.org # v5.5
Reviewed-by: Jerry Snitselaar <jsnitsel@redhat.com>
Acked-by: Lu Baolu <baolu.lu@linux.intel.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
drivers/iommu/intel-iommu.c | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)

--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -2450,11 +2450,6 @@ static void do_deferred_attach(struct de
intel_iommu_attach_device(domain, dev);
}

-static struct dmar_domain *deferred_attach_domain(struct device *dev)
-{
- return find_domain(dev);
-}
-
static inline struct device_domain_info *
dmar_search_domain_by_dev_info(int segment, int bus, int devfn)
{
@@ -3526,7 +3521,7 @@ static dma_addr_t __intel_map_single(str

BUG_ON(dir == DMA_NONE);

- domain = deferred_attach_domain(dev);
+ domain = find_domain(dev);
if (!domain)
return DMA_MAPPING_ERROR;

@@ -3746,7 +3741,7 @@ static int intel_map_sg(struct device *d
if (!iommu_need_mapping(dev))
return dma_direct_map_sg(dev, sglist, nelems, dir, attrs);

- domain = deferred_attach_domain(dev);
+ domain = find_domain(dev);
if (!domain)
return 0;

@@ -3844,7 +3839,7 @@ bounce_map_single(struct device *dev, ph
if (unlikely(attach_deferred(dev)))
do_deferred_attach(dev);

- domain = deferred_attach_domain(dev);
+ domain = find_domain(dev);

if (WARN_ON(dir == DMA_NONE || !domain))
return DMA_MAPPING_ERROR;

\
 
 \ /
  Last update: 2020-02-27 15:25    [W:0.475 / U:2.516 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site