diff options
| author | Robin Murphy <robin.murphy@arm.com> | 2021-08-11 13:21:27 +0100 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2021-08-18 13:25:32 +0200 |
| commit | 8d971243a9a7d73a410450951a21f298f1394dc7 (patch) | |
| tree | 798aeca1553d9a0da2d98d2a4f9eee0fbc281c34 /drivers/iommu | |
| parent | ca84ed7f724cf9f9620a607756482e297c2d8fea (diff) | |
| download | linux-stable-8d971243a9a7d73a410450951a21f298f1394dc7.tar.gz linux-stable-8d971243a9a7d73a410450951a21f298f1394dc7.tar.bz2 linux-stable-8d971243a9a7d73a410450951a21f298f1394dc7.zip | |
iommu/dma: Remove redundant "!dev" checks
iommu_dma_init_domain() is now only called from iommu_setup_dma_ops(),
which has already assumed dev to be non-NULL.
Reviewed-by: John Garry <john.garry@huawei.com>
Reviewed-by: Lu Baolu <baolu.lu@linux.intel.com>
Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Link: https://lore.kernel.org/r/06024523c080364390016550065e3cfe8031367e.1628682049.git.robin.murphy@arm.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Diffstat (limited to 'drivers/iommu')
| -rw-r--r-- | drivers/iommu/dma-iommu.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c index 98ba927aee1a..afaa1f9b5935 100644 --- a/drivers/iommu/dma-iommu.c +++ b/drivers/iommu/dma-iommu.c @@ -370,7 +370,7 @@ static int iommu_dma_init_domain(struct iommu_domain *domain, dma_addr_t base, init_iova_domain(iovad, 1UL << order, base_pfn); - if (!cookie->fq_domain && (!dev || !dev_is_untrusted(dev)) && + if (!cookie->fq_domain && !dev_is_untrusted(dev) && domain->ops->flush_iotlb_all && !iommu_get_dma_strict(domain)) { if (init_iova_flush_queue(iovad, iommu_dma_flush_iotlb_all, iommu_dma_entry_dtor)) @@ -379,9 +379,6 @@ static int iommu_dma_init_domain(struct iommu_domain *domain, dma_addr_t base, cookie->fq_domain = domain; } - if (!dev) - return 0; - return iova_reserve_iommu_regions(dev, domain); } |