mfd: ucb1x00: Remove NO_IRQ check
authorArnd Bergmann <arnd@arndb.de>
Tue, 6 Sep 2016 13:53:29 +0000 (15:53 +0200)
committerLee Jones <lee.jones@linaro.org>
Tue, 4 Oct 2016 14:48:03 +0000 (15:48 +0100)
probe_irq_off() returns '0' on failure, not NO_IRQ, so the check
in this driver is clearly wrong. This replaces it with the
regular '!irq' check used in other drivers.

The sa1100 platform that this driver is used on originally numbered
all its interrupts starting at '0', which would have conflicted with
this change, but as of commit 18f3aec ("ARM: 8230/1: sa1100: shift
IRQs by one"), this is not a problem any more.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
drivers/mfd/ucb1x00-core.c

index 48bea5038654884951c54917ad30d4ab27fe1431..d6fb2e1a759af77f0d073040640b64a80c91e7a9 100644 (file)
@@ -537,7 +537,7 @@ static int ucb1x00_probe(struct mcp *mcp)
        ucb1x00_enable(ucb);
        ucb->irq = ucb1x00_detect_irq(ucb);
        ucb1x00_disable(ucb);
-       if (ucb->irq == NO_IRQ) {
+       if (!ucb->irq) {
                dev_err(&ucb->dev, "IRQ probe failed\n");
                ret = -ENODEV;
                goto err_no_irq;