Commit cf86799e authored Sep 06, 2016 by Arnd Bergmann Committed by David S. Miller Sep 06, 2016

ptp: ixp46x: remove NO_IRQ handling



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>

parent 72a31d85

drivers/ptp/ptp_ixp46x.c

+8 −7

Original line number	Diff line number	Diff line
		@@ -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;