[PATCH v10 19/20] iommu/exynos: return 0 if iommu_attach_device() successes
Cho KyongHo
pullip.cho at samsung.com
Sun Oct 6 21:58:34 EDT 2013
iommu_attach_device() against exynos-iommu positive integer on success
if the caller calls iommu_attach_device() with the same iommu_domain
multiple times without call to iommu_detach_device() to inform the
caller how many calls to iommu_detach_device() to really detach iommu.
However the convention of the return value of success of common API is
zero, this patch makes iommu_attach_device() call against exynos-iommu
always return zero if the given device is successfully attached to
the given iommu_domain even though it is already attached to the same
iommu_domain.
Reviewed-by: Grant Grundler <grundler at chromium.org>
Signed-off-by: Cho KyongHo <pullip.cho at samsung.com>
---
drivers/iommu/exynos-iommu.c | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c
index 26ba554..5025338 100644
--- a/drivers/iommu/exynos-iommu.c
+++ b/drivers/iommu/exynos-iommu.c
@@ -759,15 +759,16 @@ static int exynos_iommu_attach_device(struct iommu_domain *domain,
spin_unlock_irqrestore(&priv->lock, flags);
- if (ret < 0)
+ if (ret < 0) {
dev_err(dev, "%s: Failed to attach IOMMU with pgtable %#lx\n",
__func__, __pa(priv->pgtable));
- else
- dev_dbg(dev, "%s: Attached IOMMU with pgtable 0x%lx%s\n",
- __func__, __pa(priv->pgtable),
- (ret == 0) ? "" : ", again");
+ return ret;
+ }
- return ret;
+ dev_dbg(dev, "%s: Attached IOMMU with pgtable 0x%lx%s\n",
+ __func__, __pa(priv->pgtable), (ret == 0) ? "" : ", again");
+
+ return 0;
}
static void exynos_iommu_detach_device(struct iommu_domain *domain,
--
1.7.2.5
More information about the linux-arm-kernel
mailing list