Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a62c4133 authored by Yinghai Lu's avatar Yinghai Lu Committed by Ingo Molnar
Browse files

drivers/serial: use nr_irqs 



Signed-off-by: default avatarYinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 171ac6ae

drivers/serial/8250.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

drivers/serial/amba-pl010.c

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

drivers/serial/amba-pl011.c

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

drivers/serial/cpm_uart/cpm_uart_core.c

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

drivers/serial/m32r_sio.c

+2 −2
Original line number Diff line number Diff line
@@ -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);