[PATCH v6 5/8] iommu: fix initialization without 'add_device' callback

Will Deacon will.deacon at arm.com
Mon Dec 1 08:57:11 PST 2014


From: Marek Szyprowski <m.szyprowski at samsung.com>

IOMMU drivers can be initialized from of_iommu helpers. Such drivers don't
need to provide device_add callbacks to operate properly, so there is no
need to fail initialization if the callback is missing.

Acked-by: Arnd Bergmann <arnd at arndb.de>
Signed-off-by: Marek Szyprowski <m.szyprowski at samsung.com>
Signed-off-by: Will Deacon <will.deacon at arm.com>
---
 drivers/iommu/iommu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index ed8b04867b1f..02f798b7e295 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -737,7 +737,7 @@ static int add_iommu_group(struct device *dev, void *data)
 	const struct iommu_ops *ops = cb->ops;
 
 	if (!ops->add_device)
-		return -ENODEV;
+		return 0;
 
 	WARN_ON(dev->iommu_group);
 
-- 
2.1.1




More information about the linux-arm-kernel mailing list