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

Commit 2a446241 authored by Rob Herring's avatar Rob Herring Committed by Greg Kroah-Hartman
Browse files

tty/serial: kill off set_irq_flags usage 



set_irq_flags is ARM specific with custom flags which have genirq
equivalents. Convert drivers to use the genirq interfaces directly, so we
can kill off set_irq_flags. The translation of flags is as follows:

IRQF_VALID -> !IRQ_NOREQUEST
IRQF_PROBE -> !IRQ_NOPROBE
IRQF_NOAUTOEN -> IRQ_NOAUTOEN

For IRQs managed by an irqdomain, the irqdomain core code handles clearing
and setting IRQ_NOREQUEST already, so there is no need to do this in
.map() functions and we can simply remove the set_irq_flags calls. Some
users also set IRQ_NOPROBE and this has been maintained although it is not
clear that is really needed. There appears to be a great deal of blind
copy and paste of this code.

Signed-off-by: default avatarRob Herring <robh@kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Jiri Slaby <jslaby@suse.cz>
Cc: Barry Song <baohua@kernel.org>
Cc: linux-serial@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 00fda168

drivers/tty/serial/serial_ks8695.c

+1 −1
Original line number Diff line number Diff line
@@ -328,7 +328,7 @@ static int ks8695uart_startup(struct uart_port *port) 
{

	int retval;



	set_irq_flags(KS8695_IRQ_UART_TX, IRQF_VALID | IRQF_NOAUTOEN);

	irq_modify_status(KS8695_IRQ_UART_TX, IRQ_NOREQUEST, IRQ_NOAUTOEN);

	tx_enable(port, 0);

	rx_enable(port, 1);

	ms_enable(port, 1);

drivers/tty/serial/sirfsoc_uart.c

+3 −3
Original line number Diff line number Diff line
@@ -923,7 +923,7 @@ static int sirfsoc_uart_startup(struct uart_port *port) 
	struct sirfsoc_register *ureg = &sirfport->uart_reg->uart_reg;

	unsigned int index			= port->line;

	int ret;

	set_irq_flags(port->irq, IRQF_VALID | IRQF_NOAUTOEN);

	irq_modify_status(port->irq, IRQ_NOREQUEST, IRQ_NOAUTOEN);

	ret = request_irq(port->irq,

				sirfsoc_uart_isr,

				0,
@@ -971,8 +971,8 @@ static int sirfsoc_uart_startup(struct uart_port *port) 
	sirfport->ms_enabled = false;

	if (sirfport->uart_reg->uart_type == SIRF_USP_UART &&

		sirfport->hw_flow_ctrl) {

		set_irq_flags(gpio_to_irq(sirfport->cts_gpio),

			IRQF_VALID | IRQF_NOAUTOEN);

		irq_modify_status(gpio_to_irq(sirfport->cts_gpio),

			IRQ_NOREQUEST, IRQ_NOAUTOEN);

		ret = request_irq(gpio_to_irq(sirfport->cts_gpio),

			sirfsoc_uart_usp_cts_handler, IRQF_TRIGGER_FALLING |

			IRQF_TRIGGER_RISING, "usp_cts_irq", sirfport);