diff options
-rw-r--r-- | drivers/tty/serial/serial_ks8695.c | 2 | ||||
-rw-r--r-- | drivers/tty/serial/sirfsoc_uart.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/tty/serial/serial_ks8695.c b/drivers/tty/serial/serial_ks8695.c index 5c79bdab985d..b4decf8787de 100644 --- a/drivers/tty/serial/serial_ks8695.c +++ b/drivers/tty/serial/serial_ks8695.c | |||
@@ -328,7 +328,7 @@ static int ks8695uart_startup(struct uart_port *port) | |||
328 | { | 328 | { |
329 | int retval; | 329 | int retval; |
330 | 330 | ||
331 | set_irq_flags(KS8695_IRQ_UART_TX, IRQF_VALID | IRQF_NOAUTOEN); | 331 | irq_modify_status(KS8695_IRQ_UART_TX, IRQ_NOREQUEST, IRQ_NOAUTOEN); |
332 | tx_enable(port, 0); | 332 | tx_enable(port, 0); |
333 | rx_enable(port, 1); | 333 | rx_enable(port, 1); |
334 | ms_enable(port, 1); | 334 | ms_enable(port, 1); |
diff --git a/drivers/tty/serial/sirfsoc_uart.c b/drivers/tty/serial/sirfsoc_uart.c index b6116413ca0d..653cdd5fb508 100644 --- a/drivers/tty/serial/sirfsoc_uart.c +++ b/drivers/tty/serial/sirfsoc_uart.c | |||
@@ -923,7 +923,7 @@ static int sirfsoc_uart_startup(struct uart_port *port) | |||
923 | struct sirfsoc_register *ureg = &sirfport->uart_reg->uart_reg; | 923 | struct sirfsoc_register *ureg = &sirfport->uart_reg->uart_reg; |
924 | unsigned int index = port->line; | 924 | unsigned int index = port->line; |
925 | int ret; | 925 | int ret; |
926 | set_irq_flags(port->irq, IRQF_VALID | IRQF_NOAUTOEN); | 926 | irq_modify_status(port->irq, IRQ_NOREQUEST, IRQ_NOAUTOEN); |
927 | ret = request_irq(port->irq, | 927 | ret = request_irq(port->irq, |
928 | sirfsoc_uart_isr, | 928 | sirfsoc_uart_isr, |
929 | 0, | 929 | 0, |
@@ -971,8 +971,8 @@ static int sirfsoc_uart_startup(struct uart_port *port) | |||
971 | sirfport->ms_enabled = false; | 971 | sirfport->ms_enabled = false; |
972 | if (sirfport->uart_reg->uart_type == SIRF_USP_UART && | 972 | if (sirfport->uart_reg->uart_type == SIRF_USP_UART && |
973 | sirfport->hw_flow_ctrl) { | 973 | sirfport->hw_flow_ctrl) { |
974 | set_irq_flags(gpio_to_irq(sirfport->cts_gpio), | 974 | irq_modify_status(gpio_to_irq(sirfport->cts_gpio), |
975 | IRQF_VALID | IRQF_NOAUTOEN); | 975 | IRQ_NOREQUEST, IRQ_NOAUTOEN); |
976 | ret = request_irq(gpio_to_irq(sirfport->cts_gpio), | 976 | ret = request_irq(gpio_to_irq(sirfport->cts_gpio), |
977 | sirfsoc_uart_usp_cts_handler, IRQF_TRIGGER_FALLING | | 977 | sirfsoc_uart_usp_cts_handler, IRQF_TRIGGER_FALLING | |
978 | IRQF_TRIGGER_RISING, "usp_cts_irq", sirfport); | 978 | IRQF_TRIGGER_RISING, "usp_cts_irq", sirfport); |