iommu: Remove unused argument in is_attach_deferred

[linux-2.6-block.git] / drivers / iommu / iommu.c

diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 7af0ee670deb7e51244a0a337d0814fddfb0ffe0..27276421d2532fdee6d81074738b871f13696e16 100644 (file)
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -831,13 +831,12 @@ out:
        return ret;
 }
 
-static bool iommu_is_attach_deferred(struct iommu_domain *domain,
-                                    struct device *dev)
+static bool iommu_is_attach_deferred(struct device *dev)
 {
        const struct iommu_ops *ops = dev_iommu_ops(dev);
 
        if (ops->is_attach_deferred)
-               return ops->is_attach_deferred(domain, dev);
+               return ops->is_attach_deferred(dev);
 
        return false;
 }
@@ -894,7 +893,7 @@ rename:
 
        mutex_lock(&group->mutex);
        list_add_tail(&device->list, &group->devices);
-       if (group->domain  && !iommu_is_attach_deferred(group->domain, dev))
+       if (group->domain  && !iommu_is_attach_deferred(dev))
                ret = __iommu_attach_device(group->domain, dev);
        mutex_unlock(&group->mutex);
        if (ret)
@@ -1745,7 +1744,7 @@ static int iommu_group_do_dma_attach(struct device *dev, void *data)
        struct iommu_domain *domain = data;
        int ret = 0;
 
-       if (!iommu_is_attach_deferred(domain, dev))
+       if (!iommu_is_attach_deferred(dev))
                ret = __iommu_attach_device(domain, dev);
 
        return ret;
@@ -2020,9 +2019,7 @@ EXPORT_SYMBOL_GPL(iommu_attach_device);
 
 int iommu_deferred_attach(struct device *dev, struct iommu_domain *domain)
 {
-       const struct iommu_ops *ops = dev_iommu_ops(dev);
-
-       if (ops->is_attach_deferred && ops->is_attach_deferred(domain, dev))
+       if (iommu_is_attach_deferred(dev))
                return __iommu_attach_device(domain, dev);
 
        return 0;
@@ -2031,7 +2028,7 @@ int iommu_deferred_attach(struct device *dev, struct iommu_domain *domain)
 static void __iommu_detach_device(struct iommu_domain *domain,
                                  struct device *dev)
 {
-       if (iommu_is_attach_deferred(domain, dev))
+       if (iommu_is_attach_deferred(dev))
                return;
 
        if (unlikely(domain->ops->detach_dev == NULL))