From: Joerg Roedel Date: Fri, 30 Nov 2018 13:29:01 +0000 (+0100) Subject: iommu/of: Use device_iommu_mapped() X-Git-Tag: v5.0-rc1~68^2^9~9 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=170ecbd5ff09aa9c8c1025a8563f76e01a24bb50;p=thirdparty%2Fkernel%2Flinux.git iommu/of: Use device_iommu_mapped() Use Use device_iommu_mapped() to check if the device is already mapped by an IOMMU. Acked-by: Robin Murphy Signed-off-by: Joerg Roedel --- diff --git a/drivers/iommu/of_iommu.c b/drivers/iommu/of_iommu.c index 8b071f3dcf9ef..dbe73456f1a19 100644 --- a/drivers/iommu/of_iommu.c +++ b/drivers/iommu/of_iommu.c @@ -224,7 +224,7 @@ const struct iommu_ops *of_iommu_configure(struct device *dev, * If we have reason to believe the IOMMU driver missed the initial * add_device callback for dev, replay it to get things in order. */ - if (ops && ops->add_device && dev->bus && !dev->iommu_group) + if (ops && ops->add_device && dev->bus && !device_iommu_mapped(dev)) err = ops->add_device(dev); /* Ignore all other errors apart from EPROBE_DEFER */