From patchwork Sun Feb 13 22:27:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lino Sanfilippo X-Patchwork-Id: 12744714 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 E4130C433F5 for ; Sun, 13 Feb 2022 22:31:42 +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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Mij/VBHbrGpd/8gjcd7ywqeqrR4Jt8O6pRwD/8LBwKU=; b=ngDWstmg2SRwE9 4FrN7ne/iK70gVLVg4jsxN3JQerPWokoMh3zZN5hLnc2C6RQDAPEcbzdMNSgqD9lX7e+KI17Ev+H2 o/fiUzMGgApcLsf3kokaGlHNjZVEdJRFTYSzx/aUbbNHpWWhp+2XGw0/m7oRYwgODndk/NA/daBNq 5Qhi1iWw1NDf+776gxhTgkb7nAI3ZE2GwsoA2QZzW384x8uz3JPDVFZ1XwR5uNt/mpQKY14qe87Jk NxzXpGMCg23SEIV0sGmYCEeyZoQkUlRpRBPVHhHM+XEHv3LJdnA2ptcKcyqLkeh97QpsyXczYlfIL Bl8hn0wePIK3YtlN+iEg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nJNNh-00CdGE-D4; Sun, 13 Feb 2022 22:30:09 +0000 Received: from mout.gmx.net ([212.227.17.22]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nJNM1-00CccP-ND for linux-arm-kernel@lists.infradead.org; Sun, 13 Feb 2022 22:28:27 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1644791288; bh=uj5taIEdJ6Lv1V75u7KWN5Qj+Nh06Is1dtaFBls+PDY=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=VcjeUSqNk2wot0DmejNVMqJC4kPZH1pndSE7mesHbhU2Ghjf06Jo7tD38k4uGSx8g Ytr2/JnEmmvy6VCaWVh14E3f9uOInAoMpGqPGOqoHxy1RYdrqbmOhDtzJnE7N97FUf XdBdTwgzV5TIqDVTzUWCZnvk/xXpQlzOW6eAXBm8= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from Venus.fritz.box ([149.172.237.68]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MMXQF-1ncPlv1wIB-00Jbos; Sun, 13 Feb 2022 23:28:08 +0100 From: Lino Sanfilippo To: gregkh@linuxfoundation.org, jirislaby@kernel.org Subject: [PATCH 5/9] serial: omap: remove redundant code in rs485_config Date: Sun, 13 Feb 2022 23:27:33 +0100 Message-Id: <20220213222737.15709-6-LinoSanfilippo@gmx.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220213222737.15709-1-LinoSanfilippo@gmx.de> References: <20220213222737.15709-1-LinoSanfilippo@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:X9sHYupZQvrcHlgLqYrbYPQwoslXDrcL7/CgGZCd85CUEbScmXQ dgeYkd3PBvcxbJEL7xGCejBKonr9VJtpen2Uv4WLxIm7wRH4tITAaHpboYWG1qTt2Lefm3F 8tzfOiBftGiTUQ9A1ydNYN7oQlx8OzcyCs9JElxoTYJHcceogCLGQaxeOGIQaa2Lv8aSOjM 7Bo8+KL6CI45Lzyb57W0Q== X-UI-Out-Filterresults: notjunk:1;V03:K0:Ec9qICE4XOk=:UlzKclOOGCV1qRQ9Db/6ke RW513ewoMiyKZtCXR0QKOTLX4RKt7nHX09jCx0o0tY+Fconkskawn2ztqK0Hq8ihY6q4QjTaK 7vGm/HcFS4MtA8tcAEKBfwA8qTRoATZRQik12DmtOnsIw5MyGsD5kEVKg7fU/SYLpP7DOC9Bf 4XbhbXvxbTTmRnCQRD8+iTt3gnZ7PDlQf1LIPNl88GdN0+Pxawr0Bc5N81fBSkBKG3qUUDy8c Aw+dxXCK/RSQMsofeEklJtEXgvsQ9hwkPq9ezK4PxmEmXB/cibHCGi2W5aqiqY7Djfk9tDmoF 84CqYplVZRBuqcZ0HCMhg0XuvBp1QM/ms2LiQYzOtUZbJCVARCrv9yHpdUk7hdHwnkhkveEJv MPhuE17Glp2ZfrP9rPhzi/wBR2cbiuyzLXnoP1NWQ48L+8qGCXB4eZWVKxxXXFDvE8He6zlck S5wWH/Nnfr4WPFLXjx93XLd2Cghy3maT0M8yXB3aHohsHvmiPyzlt1kfYKjXmky8xFNP6tyEZ 7KnsSHPL47Kc/yrb/k7creK7Yw1UqJ/FUYfIIN5Fn2Eyze9IRtfC0PIHn+5wD7XZhR6hZ++Bl FKrPw39cCn9VC8hUkylKFf8mzx3rqerjvc5VLqNatq539QtLnuXA6ZeQ2YU+M/CNJO0rH1Td0 ar7qJfpddWFdqD53nw3PkSmTvnqTsHyQB4hLB7gyktKO2I5uJ37wPO3fLXOzKA2RU79/nqGJJ FQqbBcn64c075PWlfl7qReNsyghzWwD3UHEcuD+6fZCYq09myaE8IyHE8v2Kz/WrEaKEn4gPI hc5voNQjf/YMpigjgH+LgoA1LjwU65POpdpv9mom62MS2UuQ1MD5Ny7mvs8uvA8Ptk9U6pTPX qYmZMKeGc9KkKeOt08jSOXBJzOSRx8KFs1Wtpa9YgCqHn8X2Xnc6IVxl8sQOw0faLyY8XMXEB epZdd0AI7l8rRlP8VCTqPh1YPlurOVaOEA5QwTIWytfjYZj+xbErOFG4n1PFWMvS1xWE5JfdA HKBCjuxiynaPIqIHqVCyN/9Ej7bTg39IfaNSkdlwZ6T7wKk3yXsDrQQhNNsMouWZaPIkCH+Kx z434pcfy3F+a3M= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220213_142826_080990_645B595E X-CRM114-Status: GOOD ( 13.06 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-kernel@lists.infradead.org, alexandre.belloni@bootlin.com, mcoquelin.stm32@gmail.com, Lino Sanfilippo , richard.genoud@gmail.com, festevam@gmail.com, s.hauer@pengutronix.de, linux@armlinux.org.uk, alexandre.torgue@foss.st.com, ludovic.desroches@microchip.com, lukas@wunner.de, linux-imx@nxp.com, kernel@pengutronix.de, linux-serial@vger.kernel.org, shawnguo@kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-kernel@vger.kernel.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org When RS485 is configured by userspace the serial core already clamps the RTS delays and assigns the configuration to the uart port. So remove these tasks from the code of the drivers rs485_config function to avoid redundancy. Signed-off-by: Lino Sanfilippo --- drivers/tty/serial/omap-serial.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c index 0862941862c8..a3afcccfbd96 100644 --- a/drivers/tty/serial/omap-serial.c +++ b/drivers/tty/serial/omap-serial.c @@ -1350,18 +1350,11 @@ serial_omap_config_rs485(struct uart_port *port, struct serial_rs485 *rs485) up->ier = 0; serial_out(up, UART_IER, 0); - /* Clamp the delays to [0, 100ms] */ - rs485->delay_rts_before_send = min(rs485->delay_rts_before_send, 100U); - rs485->delay_rts_after_send = min(rs485->delay_rts_after_send, 100U); - - /* store new config */ - port->rs485 = *rs485; - if (up->rts_gpiod) { /* enable / disable rts */ - val = (port->rs485.flags & SER_RS485_ENABLED) ? + val = (rs485->flags & SER_RS485_ENABLED) ? SER_RS485_RTS_AFTER_SEND : SER_RS485_RTS_ON_SEND; - val = (port->rs485.flags & val) ? 1 : 0; + val = (rs485->flags & val) ? 1 : 0; gpiod_set_value(up->rts_gpiod, val); } @@ -1372,7 +1365,7 @@ serial_omap_config_rs485(struct uart_port *port, struct serial_rs485 *rs485) /* If RS-485 is disabled, make sure the THR interrupt is fired when * TX FIFO is below the trigger level. */ - if (!(port->rs485.flags & SER_RS485_ENABLED) && + if (!(rs485->flags & SER_RS485_ENABLED) && (up->scr & OMAP_UART_SCR_TX_EMPTY)) { up->scr &= ~OMAP_UART_SCR_TX_EMPTY; serial_out(up, UART_OMAP_SCR, up->scr);