From: Joerg Roedel <jroedel@suse.de>
Date: Fri, 30 Nov 2018 12:14:05 +0000 (+0100)
Subject: ACPI/IORT: Use device_iommu_mapped()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=13e6a84d697e8eb8b61a3fe55b4109a666c4851d;p=linux.git

ACPI/IORT: Use device_iommu_mapped()

Replace the iommu-check with a proper and readable function
call.

Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Acked-by: Robin Murphy <robin.murphy@arm.com>
Acked-by: Hanjun Guo <hanjun.guo@linaro.org>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---

diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c
index 8fbb9d0430cf1..c057d3649a2e0 100644
--- a/drivers/acpi/arm64/iort.c
+++ b/drivers/acpi/arm64/iort.c
@@ -806,7 +806,7 @@ static inline int iort_add_device_replay(const struct iommu_ops *ops,
 {
 	int err = 0;
 
-	if (ops->add_device && dev->bus && !dev->iommu_group)
+	if (ops->add_device && dev->bus && !device_iommu_mapped(dev))
 		err = ops->add_device(dev);
 
 	return err;