Message ID | 20181211134343.10664-4-joro@8bytes.org (mailing list archive) |
---|---|
State | Mainlined |
Commit | 13e6a84d697e8eb8b61a3fe55b4109a666c4851d |
Headers | show |
Series | Introduce device_iommu_mapped() function | expand |
On 2018/12/11 21:43, Joerg Roedel wrote: > From: Joerg Roedel <jroedel@suse.de> > > 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> > Signed-off-by: Joerg Roedel <jroedel@suse.de> Acked-by: Hanjun Guo <hanjun.guo@linaro.org> Thanks Hanjun
diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c index 70f4e80b9246..0125c8eb9e81 100644 --- a/drivers/acpi/arm64/iort.c +++ b/drivers/acpi/arm64/iort.c @@ -805,7 +805,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;