iommu: fix initialization without 'add_device' callback
authorMarek Szyprowski <m.szyprowski@samsung.com>
Wed, 19 Nov 2014 11:15:31 +0000 (11:15 +0000)
committerWill Deacon <will.deacon@arm.com>
Mon, 1 Dec 2014 16:50:41 +0000 (16:50 +0000)
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@arndb.de>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
drivers/iommu/iommu.c

index ed8b04867b1fce059f2fd0ee3c242e161cdb1e52..02f798b7e295a41cebc04c3ee34655e261fc2450 100644 (file)
@@ -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);