mirror of
https://github.com/adulau/aha.git
synced 2024-12-28 11:46:19 +00:00
drivers/serial: use nr_irqs
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
parent
171ac6ae94
commit
a62c413373
9 changed files with 10 additions and 10 deletions
|
@ -2486,7 +2486,7 @@ static void serial8250_config_port(struct uart_port *port, int flags)
|
|||
static int
|
||||
serial8250_verify_port(struct uart_port *port, struct serial_struct *ser)
|
||||
{
|
||||
if (ser->irq >= NR_IRQS || ser->irq < 0 ||
|
||||
if (ser->irq >= nr_irqs || ser->irq < 0 ||
|
||||
ser->baud_base < 9600 || ser->type < PORT_UNKNOWN ||
|
||||
ser->type >= ARRAY_SIZE(uart_config) || ser->type == PORT_CIRRUS ||
|
||||
ser->type == PORT_STARTECH)
|
||||
|
|
|
@ -512,7 +512,7 @@ static int pl010_verify_port(struct uart_port *port, struct serial_struct *ser)
|
|||
int ret = 0;
|
||||
if (ser->type != PORT_UNKNOWN && ser->type != PORT_AMBA)
|
||||
ret = -EINVAL;
|
||||
if (ser->irq < 0 || ser->irq >= NR_IRQS)
|
||||
if (ser->irq < 0 || ser->irq >= nr_irqs)
|
||||
ret = -EINVAL;
|
||||
if (ser->baud_base < 9600)
|
||||
ret = -EINVAL;
|
||||
|
|
|
@ -572,7 +572,7 @@ static int pl010_verify_port(struct uart_port *port, struct serial_struct *ser)
|
|||
int ret = 0;
|
||||
if (ser->type != PORT_UNKNOWN && ser->type != PORT_AMBA)
|
||||
ret = -EINVAL;
|
||||
if (ser->irq < 0 || ser->irq >= NR_IRQS)
|
||||
if (ser->irq < 0 || ser->irq >= nr_irqs)
|
||||
ret = -EINVAL;
|
||||
if (ser->baud_base < 9600)
|
||||
ret = -EINVAL;
|
||||
|
|
|
@ -623,7 +623,7 @@ static int cpm_uart_verify_port(struct uart_port *port,
|
|||
|
||||
if (ser->type != PORT_UNKNOWN && ser->type != PORT_CPM)
|
||||
ret = -EINVAL;
|
||||
if (ser->irq < 0 || ser->irq >= NR_IRQS)
|
||||
if (ser->irq < 0 || ser->irq >= nr_irqs)
|
||||
ret = -EINVAL;
|
||||
if (ser->baud_base < 9600)
|
||||
ret = -EINVAL;
|
||||
|
|
|
@ -922,7 +922,7 @@ static void m32r_sio_config_port(struct uart_port *port, int flags)
|
|||
static int
|
||||
m32r_sio_verify_port(struct uart_port *port, struct serial_struct *ser)
|
||||
{
|
||||
if (ser->irq >= NR_IRQS || ser->irq < 0 ||
|
||||
if (ser->irq >= nr_irqs || ser->irq < 0 ||
|
||||
ser->baud_base < 9600 || ser->type < PORT_UNKNOWN ||
|
||||
ser->type >= ARRAY_SIZE(uart_config))
|
||||
return -EINVAL;
|
||||
|
@ -1162,7 +1162,7 @@ static int __init m32r_sio_init(void)
|
|||
|
||||
printk(KERN_INFO "Serial: M32R SIO driver\n");
|
||||
|
||||
for (i = 0; i < NR_IRQS; i++)
|
||||
for (i = 0; i < nr_irqs; i++)
|
||||
spin_lock_init(&irq_lists[i].lock);
|
||||
|
||||
ret = uart_register_driver(&m32r_sio_reg);
|
||||
|
|
|
@ -741,7 +741,7 @@ static int uart_set_info(struct uart_state *state,
|
|||
if (port->ops->verify_port)
|
||||
retval = port->ops->verify_port(port, &new_serial);
|
||||
|
||||
if ((new_serial.irq >= NR_IRQS) || (new_serial.irq < 0) ||
|
||||
if ((new_serial.irq >= nr_irqs) || (new_serial.irq < 0) ||
|
||||
(new_serial.baud_base < 9600))
|
||||
retval = -EINVAL;
|
||||
|
||||
|
|
|
@ -460,7 +460,7 @@ static int lh7a40xuart_verify_port (struct uart_port* port,
|
|||
|
||||
if (ser->type != PORT_UNKNOWN && ser->type != PORT_LH7A40X)
|
||||
ret = -EINVAL;
|
||||
if (ser->irq < 0 || ser->irq >= NR_IRQS)
|
||||
if (ser->irq < 0 || ser->irq >= nr_irqs)
|
||||
ret = -EINVAL;
|
||||
if (ser->baud_base < 9600) /* *** FIXME: is this true? */
|
||||
ret = -EINVAL;
|
||||
|
|
|
@ -1157,7 +1157,7 @@ static int sci_verify_port(struct uart_port *port, struct serial_struct *ser)
|
|||
{
|
||||
struct sci_port *s = &sci_ports[port->line];
|
||||
|
||||
if (ser->irq != s->irqs[SCIx_TXI_IRQ] || ser->irq > NR_IRQS)
|
||||
if (ser->irq != s->irqs[SCIx_TXI_IRQ] || ser->irq > nr_irqs)
|
||||
return -EINVAL;
|
||||
if (ser->baud_base < 2400)
|
||||
/* No paper tape reader for Mitch.. */
|
||||
|
|
|
@ -1066,7 +1066,7 @@ static int qe_uart_verify_port(struct uart_port *port,
|
|||
if (ser->type != PORT_UNKNOWN && ser->type != PORT_CPM)
|
||||
return -EINVAL;
|
||||
|
||||
if (ser->irq < 0 || ser->irq >= NR_IRQS)
|
||||
if (ser->irq < 0 || ser->irq >= nr_irqs)
|
||||
return -EINVAL;
|
||||
|
||||
if (ser->baud_base < 9600)
|
||||
|
|
Loading…
Reference in a new issue