summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJean-Philippe Brucker <jean-philippe@linaro.org>2019-11-11 12:17:21 +0100
committerJoerg Roedel <jroedel@suse.de>2019-11-11 15:44:17 +0100
commit34d1b0895dbd10713c73615d8f532e78509e12d9 (patch)
tree9867436b1f9ec987f18d9e18747150f5ba1deb4e /drivers
parentf7aff1a93f52047739af31072de0ad8d149641f3 (diff)
downloadlinux-stable-34d1b0895dbd10713c73615d8f532e78509e12d9.tar.gz
linux-stable-34d1b0895dbd10713c73615d8f532e78509e12d9.tar.bz2
linux-stable-34d1b0895dbd10713c73615d8f532e78509e12d9.zip
iommu/arm-smmu: Remove duplicate error message
Since commit 7723f4c5ecdb ("driver core: platform: Add an error message to platform_get_irq*()"), platform_get_irq() displays an error when the IRQ isn't found. Remove the error print from the SMMU driver. Note the slight change of behaviour: no message is printed if platform_get_irq() returns -EPROBE_DEFER, which probably doesn't concern the SMMU. Fixes: 7723f4c5ecdb ("driver core: platform: Add an error message to platform_get_irq*()") Signed-off-by: Jean-Philippe Brucker <jean-philippe@linaro.org> Acked-by: Will Deacon <will@kernel.org> Signed-off-by: Joerg Roedel <jroedel@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/iommu/arm-smmu.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
index 424ebf38cd09..f05c821dd181 100644
--- a/drivers/iommu/arm-smmu.c
+++ b/drivers/iommu/arm-smmu.c
@@ -2095,10 +2095,8 @@ static int arm_smmu_device_probe(struct platform_device *pdev)
for (i = 0; i < num_irqs; ++i) {
int irq = platform_get_irq(pdev, i);
- if (irq < 0) {
- dev_err(dev, "failed to get irq index %d\n", i);
+ if (irq < 0)
return -ENODEV;
- }
smmu->irqs[i] = irq;
}