From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 994FEC282CE for ; Wed, 24 Apr 2019 17:17:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 64B0621905 for ; Wed, 24 Apr 2019 17:17:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556126262; bh=tEs6T9b/XAwuEFsmpMnwFbgJDetSLRsgsNyI2loY7DQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=h4zq6EpPdqnD7xZ1OaD56jLWaaw5QPrMLZ5VCccVCh6C5xKPkqmH5/6gj5106Jyd3 Ii6vkA2mHM0iFD/EDEWJM49DgwXg4yPOLMNhj9LdUPVkU8XdgZ84+wxmCnd80h1E4o UyHWlZYZLf7JABUF72bvBTWBXJ6rHbtEdb5J5rFg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388690AbfDXRRl (ORCPT ); Wed, 24 Apr 2019 13:17:41 -0400 Received: from mail.kernel.org ([198.145.29.99]:42600 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388658AbfDXRRj (ORCPT ); Wed, 24 Apr 2019 13:17:39 -0400 Received: from localhost (62-193-50-229.as16211.net [62.193.50.229]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 92D44218B0; Wed, 24 Apr 2019 17:17:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556126259; bh=tEs6T9b/XAwuEFsmpMnwFbgJDetSLRsgsNyI2loY7DQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hkagJD7pNzuLIXUGoqJNxWo4O8U+p91FTAMxvORZ1SirsiVNakj3+cFSSkcjPHBDg Fry+lxTg3lHtO89hz55idTw1uUmC+AmlmfZemJKE/bl3iz0D9qVrW7goZoSdSXyWWP PztP0/5Nz8AHj/7lvCGPUQuVHsuYZ7u+icBp0xvo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Razvan Stefanescu , Richard Genoud Subject: [PATCH 4.4 005/168] tty/serial: atmel: Add is_half_duplex helper Date: Wed, 24 Apr 2019 19:07:29 +0200 Message-Id: <20190424170923.774937228@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190424170923.452349382@linuxfoundation.org> References: <20190424170923.452349382@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Razvan Stefanescu commit f3040983132bf3477acd45d2452a906e67c2fec9 upstream. Use a helper function to check that a port needs to use half duplex communication, replacing several occurrences of multi-line bit checking. Fixes: b389f173aaa1 ("tty/serial: atmel: RS485 half duplex w/DMA: enable RX after TX is done") Cc: stable Signed-off-by: Razvan Stefanescu Acked-by: Richard Genoud Signed-off-by: Greg Kroah-Hartman --- drivers/tty/serial/atmel_serial.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) --- a/drivers/tty/serial/atmel_serial.c +++ b/drivers/tty/serial/atmel_serial.c @@ -237,6 +237,12 @@ static inline void atmel_uart_write_char #endif +static inline int atmel_uart_is_half_duplex(struct uart_port *port) +{ + return (port->rs485.flags & SER_RS485_ENABLED) && + !(port->rs485.flags & SER_RS485_RX_DURING_TX); +} + #ifdef CONFIG_SERIAL_ATMEL_PDC static bool atmel_use_pdc_rx(struct uart_port *port) { @@ -481,9 +487,9 @@ static void atmel_stop_tx(struct uart_po /* Disable interrupts */ atmel_uart_writel(port, ATMEL_US_IDR, atmel_port->tx_done_mask); - if ((port->rs485.flags & SER_RS485_ENABLED) && - !(port->rs485.flags & SER_RS485_RX_DURING_TX)) + if (atmel_uart_is_half_duplex(port)) atmel_start_rx(port); + } /* @@ -500,8 +506,7 @@ static void atmel_start_tx(struct uart_p return; if (atmel_use_pdc_tx(port) || atmel_use_dma_tx(port)) - if ((port->rs485.flags & SER_RS485_ENABLED) && - !(port->rs485.flags & SER_RS485_RX_DURING_TX)) + if (atmel_uart_is_half_duplex(port)) atmel_stop_rx(port); if (atmel_use_pdc_tx(port)) @@ -810,8 +815,7 @@ static void atmel_complete_tx_dma(void * */ if (!uart_circ_empty(xmit)) tasklet_schedule(&atmel_port->tasklet); - else if ((port->rs485.flags & SER_RS485_ENABLED) && - !(port->rs485.flags & SER_RS485_RX_DURING_TX)) { + else if (atmel_uart_is_half_duplex(port)) { /* DMA done, stop TX, start RX for RS485 */ atmel_start_rx(port); } @@ -1388,8 +1392,7 @@ static void atmel_tx_pdc(struct uart_por atmel_uart_writel(port, ATMEL_US_IER, atmel_port->tx_done_mask); } else { - if ((port->rs485.flags & SER_RS485_ENABLED) && - !(port->rs485.flags & SER_RS485_RX_DURING_TX)) { + if (atmel_uart_is_half_duplex(port)) { /* DMA done, stop TX, start RX for RS485 */ atmel_start_rx(port); }