From patchwork Mon Oct 24 11:30:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9611 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp530905wru; Mon, 24 Oct 2022 09:05:42 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6geyq0zWaly0l29y7/ykjqkHYh+hIPYSWn3MBcYbo413vuo7k9F5pFQcUKeHgPsccAbH8R X-Received: by 2002:a63:2c4c:0:b0:434:e001:89fd with SMTP id s73-20020a632c4c000000b00434e00189fdmr28701405pgs.444.1666627542114; Mon, 24 Oct 2022 09:05:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666627542; cv=none; d=google.com; s=arc-20160816; b=eGggdLgZpLvg26le1Tejs3egjAY3lS6LsCgOKLxmMVrTdiZ9TxjHs+oV1GNCyycRmJ A3ZJG9mtD0OFKQoUbZsBuXZON/eTvqKt0UVrkehb4dZZymQ0xTT5mCvQVYaGTb5g1jkX F77Nb8/JBzd1swLKQBswxhmmNuRF4/clkeakD9D6rcKZ7OadlK45eEa9zS07nR6jEt/S g2me8HenWl20C5dMwB9iV4ieZJ8/oKHVMRepEMR8whdWisSDBG2lSvKIX6E6OwNgFzk8 vNIbBx5eXoQwFwekj3ueJksujx4VRKlv/RFm1MbUmIkgG+X+MTFGUC10JgcpyHnQo+F5 sVEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=bDiXtC1cHNFvA8WY733Eb4phnf9fm3E37nhlfeVdPuw=; b=CJp7ctw1uvqu2LEj1dMFyNzf/lRS4Jrs4tzw62LJxxHzp4qnZavJdlOEIpf+ehkS2x j9lh2eltq8/VER2oSx37Xz4SYsXTzkfgOtRektxjxrqmXDlQwR2MSnROGlKKMv3koi3/ rbW1l0bqplsS+hNOg44/VSbkrvMr7x+EqLzpJpFQd1ODWAQqebiu3qF0TfZUn9t0lDnz OlmSKr9cXMjqUBF7QoF3Q6aLv4hPLJh1U05ihK7L6/E4bapMuduPSEzPWOEGIIygr3lC ShISN29mS4eYiGqbVZIo7MOzCz47BoouSHvBUystxf+voPtIETh34MKw7jzyG2XMpGmL RZDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=uINb36pS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id mq10-20020a17090b380a00b0020daab63f66si432315pjb.31.2022.10.24.09.05.28; Mon, 24 Oct 2022 09:05:42 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=uINb36pS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230378AbiJXQD2 (ORCPT + 99 others); Mon, 24 Oct 2022 12:03:28 -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 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747585642016511414?= X-GMAIL-MSGID: =?utf-8?q?1747585642016511414?= 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.1619594713.git.christophe.jaillet@wanadoo.fr Signed-off-by: Greg Kroah-Hartman Stable-dep-of: 039d4926379b ("serial: 8250: Toggle IER bits on only after irq 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 = serial_link_irq_chain(up); return retval; @@ -766,6 +766,7 @@ void serial8250_suspend_port(int line) if (!console_suspend_enabled && uart_console(port) && port->type != PORT_8250) { unsigned char canary = 0xa5; + serial_out(up, UART_SCR, canary); if (serial_in(up, UART_SCR) == canary) up->canary = canary;