diff options
author | Alan Cox <alan@linux.intel.com> | 2012-01-26 12:44:09 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2012-01-26 20:14:50 -0500 |
commit | d4e33fac2408d37f7b52e80ca2a89f9fb482914f (patch) | |
tree | dd25baa1bc251ad2aa61a07eda7f95a4d7094126 /drivers/tty/serial/21285.c | |
parent | 3afbd89c9639c344300dcdd7d4e5e18dda559fd4 (diff) |
serial: Kill off NO_IRQ
We transform the offenders into a test of irq <= 0 which will be ok while
the ARM people get their platform sorted. Once that is done (or in a while
if they don't do it anyway) then we will change them all to !irq checks.
For arch specific drivers that are already using NO_IRQ = 0 we just test
against zero so we don't need to re-review them later.
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/tty/serial/21285.c')
-rw-r--r-- | drivers/tty/serial/21285.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/tty/serial/21285.c b/drivers/tty/serial/21285.c index 1b37626e8f13..f899996b4363 100644 --- a/drivers/tty/serial/21285.c +++ b/drivers/tty/serial/21285.c | |||
@@ -331,7 +331,7 @@ static int serial21285_verify_port(struct uart_port *port, struct serial_struct | |||
331 | int ret = 0; | 331 | int ret = 0; |
332 | if (ser->type != PORT_UNKNOWN && ser->type != PORT_21285) | 332 | if (ser->type != PORT_UNKNOWN && ser->type != PORT_21285) |
333 | ret = -EINVAL; | 333 | ret = -EINVAL; |
334 | if (ser->irq != NO_IRQ) | 334 | if (ser->irq <= 0) |
335 | ret = -EINVAL; | 335 | ret = -EINVAL; |
336 | if (ser->baud_base != port->uartclk / 16) | 336 | if (ser->baud_base != port->uartclk / 16) |
337 | ret = -EINVAL; | 337 | ret = -EINVAL; |
@@ -360,7 +360,7 @@ static struct uart_ops serial21285_ops = { | |||
360 | static struct uart_port serial21285_port = { | 360 | static struct uart_port serial21285_port = { |
361 | .mapbase = 0x42000160, | 361 | .mapbase = 0x42000160, |
362 | .iotype = UPIO_MEM, | 362 | .iotype = UPIO_MEM, |
363 | .irq = NO_IRQ, | 363 | .irq = 0, |
364 | .fifosize = 16, | 364 | .fifosize = 16, |
365 | .ops = &serial21285_ops, | 365 | .ops = &serial21285_ops, |
366 | .flags = UPF_BOOT_AUTOCONF, | 366 | .flags = UPF_BOOT_AUTOCONF, |