[PATCH] tty: serial: meson: Change request_irq to devm_request_irq and move devm_request_irq to meson_uart_probe()
Yu Tu
yu.tu at amlogic.com
Mon Jan 10 00:54:57 PST 2022
Hi All,
I'm really sorry for sending the wrong specified file. Please ignore
the email. I will resend V4.
On 2022/1/10 16:26, Yu Tu wrote:
> Because an interrupt error occurs when the user opens /dev/ttyAML* but
> don't close it, and then opens the same port again. This problem is
> encountered in actual projects.
>
> Signed-off-by: Yu Tu <yu.tu at amlogic.com>
> ---
> drivers/tty/serial/meson_uart.c | 16 +++++++++-------
> 1 file changed, 9 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/tty/serial/meson_uart.c b/drivers/tty/serial/meson_uart.c
> index 45e41f20cba3..0dd3f5b35768 100644
> --- a/drivers/tty/serial/meson_uart.c
> +++ b/drivers/tty/serial/meson_uart.c
> @@ -135,8 +135,6 @@ static void meson_uart_shutdown(struct uart_port *port)
> unsigned long flags;
> u32 val;
>
> - free_irq(port->irq, port);
> -
> spin_lock_irqsave(&port->lock, flags);
>
> val = readl(port->membase + AML_UART_CONTROL);
> @@ -284,7 +282,6 @@ static void meson_uart_reset(struct uart_port *port)
> static int meson_uart_startup(struct uart_port *port)
> {
> u32 val;
> - int ret;
>
> meson_uart_reset(port);
>
> @@ -298,10 +295,7 @@ static int meson_uart_startup(struct uart_port *port)
> val = (AML_UART_RECV_IRQ(1) | AML_UART_XMIT_IRQ(port->fifosize / 2));
> writel(val, port->membase + AML_UART_MISC);
>
> - ret = request_irq(port->irq, meson_uart_interrupt, 0,
> - port->name, port);
> -
> - return ret;
> + return 0;
> }
>
> static void meson_uart_change_speed(struct uart_port *port, unsigned long baud)
> @@ -908,6 +902,14 @@ static int meson_uart_probe(struct platform_device *pdev)
> meson_ports[pdev->id] = port;
> platform_set_drvdata(pdev, port);
>
> + ret = devm_request_irq(&pdev->dev, port->irq, meson_uart_interrupt,
> + 0, dev_name(&pdev->dev), port);
> + if (ret) {
> + dev_err(&pdev->dev, "failed to request uart irq: %d\n",
> + ret);
> + return ret;
> + }
> +
> /* reset port before registering (and possibly registering console) */
> meson_uart_reset(port);
>
>
> base-commit: b3a9e3b9622ae10064826dccb4f7a52bd88c7407
> prerequisite-patch-id: 97a514f3447511cb204179ce03ae99dc1d5902d9
> prerequisite-patch-id: a2e4756ff85f0df0efe111d7e2cb51b8e26e226f
> prerequisite-patch-id: af9e3acc8f6ff7602d3a68a57c008e5ec362b353
> prerequisite-patch-id: 7af8c81b4c2163240725e96625b1487c280f4f30
> prerequisite-patch-id: 8791f6362b14e7c4ff4f85cce550f06abeb1af7a
More information about the linux-amlogic
mailing list