diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-09-06 21:20:36 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-09-06 16:57:02 -0700 |
| commit | cf86799e816fe3a6e47eab3f0beb735d5944f01a (patch) | |
| tree | ac7c40ce165522ce5b6c9a1ff443ce635136980d /drivers/ptp | |
| parent | 72a31d85a56581f0369f881c453d9c212a2bad38 (diff) | |
| download | linux-cf86799e816fe3a6e47eab3f0beb735d5944f01a.tar.gz linux-cf86799e816fe3a6e47eab3f0beb735d5944f01a.tar.bz2 linux-cf86799e816fe3a6e47eab3f0beb735d5944f01a.zip | |
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>
Diffstat (limited to 'drivers/ptp')
| -rw-r--r-- | drivers/ptp/ptp_ixp46x.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/ptp/ptp_ixp46x.c b/drivers/ptp/ptp_ixp46x.c index ee4f183ef9ee..344a3bac210b 100644 --- a/drivers/ptp/ptp_ixp46x.c +++ b/drivers/ptp/ptp_ixp46x.c @@ -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; |