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

joergroedel · joergroedel · commit d2e1a003af56 · 2018-12-17T12:47:51.000+01:00
Make sure to invoke this call-back through the proper
function of the IOMMU-API.

Acked-by: Hanjun Guo &lt;hanjun.guo@linaro.org&gt;
Signed-off-by: Joerg Roedel &lt;jroedel@suse.de&gt;
diff --git 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;
 }

Original file line number	Diff line number	Diff line change
`@@ -806,8 +806,8 @@ static inline int iort_add_device_replay(const struct iommu_ops *ops,`
`806`	`806`	`{`
`807`	`807`	`int err = 0;`
`808`	`808`
`809`		`- if (ops->add_device && dev->bus && !device_iommu_mapped(dev))`
`810`		`- err = ops->add_device(dev);`
	`809`	`+ if (dev->bus && !device_iommu_mapped(dev))`
	`810`	`+ err = iommu_probe_device(dev);`
`811`	`811`
`812`	`812`	`return err;`
`813`	`813`	`}`