From nobody Fri Dec 19 16:00:56 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 50860ECAAA1 for ; Mon, 24 Oct 2022 16:03:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232439AbiJXQDa (ORCPT ); Mon, 24 Oct 2022 12:03:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38458 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232370AbiJXQC2 (ORCPT ); Mon, 24 Oct 2022 12:02:28 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 27151112A86; Mon, 24 Oct 2022 07:55:42 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 9559AB81680; Mon, 24 Oct 2022 12:26:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F354FC433D6; Mon, 24 Oct 2022 12:26:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666614371; bh=fVjz5Ks1uqp8ZxMRnCA4ldqH2dXUZmbtXtJd8+Cg3r0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uINb36pSX2qsT1/FwFZEO6fOlTeoDyPqpCfT31zrZk0ZiT8jocBts1ZWNwg4d9dg1 tTrCnLR6ZnX6y7PdbJBNdxPMRrpbXjtDkI5xvEzeyQTWDQPIvSIDwk6TriRkqom5rP KG2LldHZUppDmGV45UhtePY3fg63nFUXXNm4QS0s= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Andy Shevchenko , Christophe JAILLET , Sasha Levin Subject: [PATCH 5.10 236/390] serial: 8250: Add an empty line and remove some useless {} Date: Mon, 24 Oct 2022 13:30:33 +0200 Message-Id: <20221024113032.840433308@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113022.510008560@linuxfoundation.org> References: <20221024113022.510008560@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Christophe JAILLET [ Upstream commit 26f7591632d74f637f346f5d642d8ebe6b433fc9 ] This fixes the following checkpatch.pl warnings: WARNING: Missing a blank line after declarations WARNING: braces {} are not necessary for any arm of this statement Reviewed-by: Andy Shevchenko Signed-off-by: Christophe JAILLET Link: https://lore.kernel.org/r/257ffd691b4a062ad017333c9430d69da6dbd29a.16= 19594713.git.christophe.jaillet@wanadoo.fr Signed-off-by: Greg Kroah-Hartman Stable-dep-of: 039d4926379b ("serial: 8250: Toggle IER bits on only after i= rq has been set up") Signed-off-by: Sasha Levin --- drivers/tty/serial/8250/8250_core.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/= 8250_core.c index 98ce484f1089..aae9d26ce4f4 100644 --- a/drivers/tty/serial/8250/8250_core.c +++ b/drivers/tty/serial/8250/8250_core.c @@ -332,9 +332,9 @@ static int univ8250_setup_irq(struct uart_8250_port *up) * hardware interrupt, we use a timer-based system. The original * driver used to do this with IRQ0. */ - if (!port->irq) { + if (!port->irq) mod_timer(&up->timer, jiffies + uart_poll_timeout(port)); - } else + else retval =3D serial_link_irq_chain(up); =20 return retval; @@ -766,6 +766,7 @@ void serial8250_suspend_port(int line) if (!console_suspend_enabled && uart_console(port) && port->type !=3D PORT_8250) { unsigned char canary =3D 0xa5; + serial_out(up, UART_SCR, canary); if (serial_in(up, UART_SCR) =3D=3D canary) up->canary =3D canary; --=20 2.35.1