[PATCH 4/6] powerpc/iommu: Use device_iommu_mapped()

[Joerg Roedel]

From: Joerg Roedel <jroe...@suse.de>

Use the new function to replace the open-coded iommu check.

Cc: Benjamin Herrenschmidt <b...@kernel.crashing.org>
Cc: Paul Mackerras <pau...@samba.org>
Cc: Russell Currey <rus...@russell.cc>
Cc: Sam Bobroff <sbobr...@linux.ibm.com>
Acked-by: Robin Murphy <robin.mur...@arm.com>
Signed-off-by: Joerg Roedel <jroe...@suse.de>
---
 arch/powerpc/kernel/eeh.c   | 2 +-
 arch/powerpc/kernel/iommu.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/powerpc/kernel/eeh.c b/arch/powerpc/kernel/eeh.c
index 6cae6b56ffd6..23fe62f11486 100644
--- a/arch/powerpc/kernel/eeh.c
+++ b/arch/powerpc/kernel/eeh.c
@@ -1472,7 +1472,7 @@ static int dev_has_iommu_table(struct device *dev, void 
*data)
        if (!dev)
                return 0;
 
-       if (dev->iommu_group) {
+       if (device_iommu_mapped(dev)) {
                *ppdev = pdev;
                return 1;
        }
diff --git a/arch/powerpc/kernel/iommu.c b/arch/powerpc/kernel/iommu.c
index f0dc680e659a..48d58d1dcac2 100644
--- a/arch/powerpc/kernel/iommu.c
+++ b/arch/powerpc/kernel/iommu.c
@@ -1086,7 +1086,7 @@ int iommu_add_device(struct device *dev)
        if (!device_is_registered(dev))
                return -ENOENT;
 
-       if (dev->iommu_group) {
+       if (device_iommu_mapped(dev)) {
                pr_debug("%s: Skipping device %s with iommu group %d\n",
                         __func__, dev_name(dev),
                         iommu_group_id(dev->iommu_group));
@@ -1129,7 +1129,7 @@ void iommu_del_device(struct device *dev)
         * and we needn't detach them from the associated
         * IOMMU groups
         */
-       if (!dev->iommu_group) {
+       if (!device_iommu_mapped(dev)) {
                pr_debug("iommu_tce: skipping device %s with no tbl\n",
                         dev_name(dev));
                return;
@@ -1148,7 +1148,7 @@ static int tce_iommu_bus_notifier(struct notifier_block 
*nb,
         case BUS_NOTIFY_ADD_DEVICE:
                 return iommu_add_device(dev);
         case BUS_NOTIFY_DEL_DEVICE:
-                if (dev->iommu_group)
+                if (device_iommu_mapped(dev))
                         iommu_del_device(dev);
                 return 0;
         default:
-- 
2.17.1