From patchwork Tue Dec 21 07:16:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Tu X-Patchwork-Id: 12689181 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8B06FC433EF for ; Tue, 21 Dec 2021 07:17:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=vaLUjbIgUURL6fgii5/oeMLQKZ72tUhYeDUl57rP7EM=; b=H7fcXRUCuixUKP 6Kz1e0X3dxwJ5UHOXq0LhAk6fFevfoFDruntZGyP0TliQ0XTArIVWdlShnMsIjAWvA5A6Gw/XMb0I b/oRGt5Vfe3+r3qbfPyzjYsgF8k/zV0CKIxCiR0iqO9BRExGCmBw7uC/56T9sVMsV/m4x+Gry0oeI gl2JNflqWjvhntmVJ2aFw7NU/PWGkxPDWj0PQW3/OsoPR4fMLnPWbUKKh7m+vocIOK1TrJIQDEhct BEfFoEVHQ+wrBDpSilBuQskFk3QtLi/Mc+Zq7pVRv57FcNlr7eC1Uoa4RQuZuVx4eOt5IFVqwrl67 N0EJypy9RLSK46bBQjHg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mzZP3-005joD-HD; Tue, 21 Dec 2021 07:17:41 +0000 Received: from mail-sh.amlogic.com ([58.32.228.43]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mzZOc-005jgE-4D; Tue, 21 Dec 2021 07:17:15 +0000 Received: from droid06.amlogic.com (10.18.11.248) by mail-sh.amlogic.com (10.18.11.5) with Microsoft SMTP Server id 15.1.2176.14; Tue, 21 Dec 2021 15:17:01 +0800 From: Yu Tu To: , , , CC: Greg Kroah-Hartman , Jiri Slaby , Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , Yu Tu Subject: [PATCH 1/3] tty: serial: meson: modify request_irq and free_irq Date: Tue, 21 Dec 2021 15:16:32 +0800 Message-ID: <20211221071634.25980-2-yu.tu@amlogic.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211221071634.25980-1-yu.tu@amlogic.com> References: <20211221071634.25980-1-yu.tu@amlogic.com> MIME-Version: 1.0 X-Originating-IP: [10.18.11.248] X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211220_231714_195708_8F30964E X-CRM114-Status: UNSURE ( 9.44 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+linux-amlogic=archiver.kernel.org@lists.infradead.org Change request_irq to devm_request_irq and free_irq to devm_free_irq. It's better to change the code this way. The IRQF_SHARED interrupt flag was added because an interrupt error was detected when the serial port was opened twice in a row on the project. Signed-off-by: Yu Tu --- drivers/tty/serial/meson_uart.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/tty/serial/meson_uart.c b/drivers/tty/serial/meson_uart.c index d2c08b760f83..02fafb8229d2 100644 --- a/drivers/tty/serial/meson_uart.c +++ b/drivers/tty/serial/meson_uart.c @@ -121,7 +121,7 @@ static void meson_uart_shutdown(struct uart_port *port) unsigned long flags; u32 val; - free_irq(port->irq, port); + devm_free_irq(port->dev, port->irq, port); spin_lock_irqsave(&port->lock, flags); @@ -287,8 +287,8 @@ 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); + ret = devm_request_irq(port->dev, port->irq, meson_uart_interrupt, + IRQF_SHARED, port->name, port); return ret; }