ptp: ixp46x: remove NO_IRQ handling
authorArnd Bergmann <arnd@arndb.de>
Tue, 6 Sep 2016 19:20:36 +0000 (21:20 +0200)
committerDavid S. Miller <davem@davemloft.net>
Tue, 6 Sep 2016 23:57:02 +0000 (16:57 -0700)
gpio_to_irq does not return NO_IRQ but instead returns a negative
error code on failure. Returning NO_IRQ from the function has no
negative effects as we only compare the result to the expected
interrupt number, but it's better to return a proper failure
code for consistency, and we should remove NO_IRQ from the kernel
entirely.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/ptp/ptp_ixp46x.c

index ee4f183ef9eed337b012c4088bfeba5ae0c949a3..344a3bac210b63003f94130aec94f3df4b17961a 100644 (file)
@@ -268,18 +268,19 @@ static int setup_interrupt(int gpio)
                return err;
 
        irq = gpio_to_irq(gpio);
+       if (irq < 0)
+               return irq;
 
-       if (NO_IRQ == irq)
-               return NO_IRQ;
-
-       if (irq_set_irq_type(irq, IRQF_TRIGGER_FALLING)) {
+       err = irq_set_irq_type(irq, IRQF_TRIGGER_FALLING);
+       if (err) {
                pr_err("cannot set trigger type for irq %d\n", irq);
-               return NO_IRQ;
+               return err;
        }
 
-       if (request_irq(irq, isr, 0, DRIVER, &ixp_clock)) {
+       err = request_irq(irq, isr, 0, DRIVER, &ixp_clock);
+       if (err) {
                pr_err("request_irq failed for irq %d\n", irq);
-               return NO_IRQ;
+               return err;
        }
 
        return irq;