From: Joerg Roedel <jroedel@suse.de>
Date: Wed, 5 Dec 2018 13:39:45 +0000 (+0100)
Subject: ACPI/IORT: Don't call iommu_ops->add_device directly
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d2e1a003af56;p=linux.git

ACPI/IORT: Don't call iommu_ops->add_device directly

Make sure to invoke this call-back through the proper
function of the IOMMU-API.

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 c057d3649a2e0..ec248c067f6d5 100644
--- a/drivers/acpi/arm64/iort.c
+++ b/drivers/acpi/arm64/iort.c
@@ -806,8 +806,8 @@ static inline int iort_add_device_replay(const struct iommu_ops *ops,
 {
 	int err = 0;
 
-	if (ops->add_device && dev->bus && !device_iommu_mapped(dev))
-		err = ops->add_device(dev);
+	if (dev->bus && !device_iommu_mapped(dev))
+		err = iommu_probe_device(dev);
 
 	return err;
 }