summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWang Kefeng <wangkefeng.wang@huawei.com>2021-08-23 10:41:42 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-11-06 14:10:09 +0100
commitf84b791d4c3b459ef404c32fc5986f18758461e9 (patch)
tree9bc69000c85bab1ca61ff832107273ed7609487d
parentbbc920fb320f1c241cc34ac85edaa0058922246a (diff)
downloadlinux-stable-f84b791d4c3b459ef404c32fc5986f18758461e9.tar.gz
linux-stable-f84b791d4c3b459ef404c32fc5986f18758461e9.tar.bz2
linux-stable-f84b791d4c3b459ef404c32fc5986f18758461e9.zip
ARM: 9120/1: Revert "amba: make use of -1 IRQs warn"
commit eb4f756915875b0ea0757751cd29841f0504d547 upstream. After commit 77a7300abad7 ("of/irq: Get rid of NO_IRQ usage"), no irq case has been removed, irq_of_parse_and_map() will return 0 in all cases when get error from parse and map an interrupt into linux virq space. amba_device_register() is only used on no-DT initialization, see s3c64xx_pl080_init() arch/arm/mach-s3c/pl080.c ep93xx_init_devices() arch/arm/mach-ep93xx/core.c They won't set -1 to irq[0], so no need the warn. This reverts commit 2eac58d5026e4ec8b17ff8b62877fea9e1d2f1b3. Reviewed-by: Rob Herring <robh@kernel.org> Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com> Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/amba/bus.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c
index b5f5ca4e3f34..8f4ae6e967e3 100644
--- a/drivers/amba/bus.c
+++ b/drivers/amba/bus.c
@@ -375,9 +375,6 @@ static int amba_device_try_add(struct amba_device *dev, struct resource *parent)
void __iomem *tmp;
int i, ret;
- WARN_ON(dev->irq[0] == (unsigned int)-1);
- WARN_ON(dev->irq[1] == (unsigned int)-1);
-
ret = request_resource(parent, &dev->res);
if (ret)
goto err_out;