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 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 91F81C4707B for ; Thu, 18 Jan 2024 12:45:30 +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: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:In-Reply-To:References: List-Owner; bh=3yOQX/fF6xtm97V9bDYlnOO+Otgdcg5ZlEr7wPo5fUY=; b=A8xAS/Bb122w91 KpMFVPCUW84WBFg/UMymxxPhqoRukx2iPiDBpArH4vs2fIh1sbi0h+BkJ2Dz6sgZCmk81bIPklKTs WoRvGNqZ/ZyB5TnrxAs6/XLHvaZJl7ENDVEZJ4K+VHhE1Y5GWHy8fmoXUTytqOYjID4WEcmFD5hEy QzJZgagTJQtVIshTbo3lTCS75geazFZIOPVbyYCrFoLUiZyiPahJsRn1Ot5B2ohQkPryei3hUYXdL WcXBeJViMLZ7GEPk4vQy1FPgBckofR58ly/iQrD5u8t9c4TafxndmR/c7WbjtGxwZoj85pOtzlZ1+ Sf/PJKK0G3gZA7Gl1NVQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rQRlV-002lHP-23; Thu, 18 Jan 2024 12:45:01 +0000 Received: from mx2.securetransport.de ([188.68.39.254]) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rQRlS-002lF6-2u for linux-arm-kernel@lists.infradead.org; Thu, 18 Jan 2024 12:45:00 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dh-electronics.com; s=dhelectronicscom; t=1705581868; bh=Cvsf1PsKgB1xMQ27fbc6IgM0URoxwKPHzx8AByXg2/A=; h=From:To:CC:Subject:Date:From; b=M745w9AJ/5+KrSlMj2cF9ullsOkOJwXVJoayaAMX/Lr44n61PwKYuYA1YWEfBZQaA PyabsIVqKnZLc8otAH3ICtAeOtQ/P5cOqJBtQ3HoDY37cUqESrtiZrB62KI4P/p74e GE66ymS765jwUQfvGEZeeQu5O//frEwISN3+0wQ0iFig6Ulh02lXkHkisVuZqGfe+C CUqMDjReNd4pmrO2qoNmMjyuniHU8h3TFd/cb3pTUlKV6cnGTkx2YQge7ut2N8A1Sh cx/cZhko0YDBVeQaFqhsPo8AhkTf/wrPj83fBy/CBLWVNctmp403hUp3y1Y1Q6zDO8 9r8nulhn7rPMQ== From: Christoph Niedermaier To: , CC: Christoph Niedermaier , Greg Kroah-Hartman , Crescent CY Hsieh , Jiri Slaby , Lukas Wunner , Lino Sanfilippo Subject: [PATCH] tty: serial: Fix bit order in RS485 flag definitions Date: Thu, 18 Jan 2024 13:43:50 +0100 Message-ID: <20240118124350.3772-1-cniedermaier@dh-electronics.com> X-klartext: yes MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240118_044459_248897_720F52F0 X-CRM114-Status: GOOD ( 10.31 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Since the commit 93f3350c46fa ("RS485: fix inconsistencies in the meaning of some variables"), the definition for bit 3 has been removed. But with the switch to bit shift marcos in commit 76ac8e29855b ("tty: serial: Cleanup the bit shift with macro"), this gap wasn't preserved. To avoid a break in user/kernel api of the system skip bit 3 again and add a placeholder comment. Signed-off-by: Christoph Niedermaier --- Cc: Greg Kroah-Hartman Cc: Crescent CY Hsieh Cc: Jiri Slaby Cc: Lukas Wunner Cc: Lino Sanfilippo To: linux-serial@vger.kernel.org To: linux-arm-kernel@lists.infradead.org --- include/uapi/linux/serial.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/include/uapi/linux/serial.h b/include/uapi/linux/serial.h index 9086367db043..de9b4733607e 100644 --- a/include/uapi/linux/serial.h +++ b/include/uapi/linux/serial.h @@ -145,12 +145,13 @@ struct serial_rs485 { #define SER_RS485_ENABLED _BITUL(0) #define SER_RS485_RTS_ON_SEND _BITUL(1) #define SER_RS485_RTS_AFTER_SEND _BITUL(2) -#define SER_RS485_RX_DURING_TX _BITUL(3) -#define SER_RS485_TERMINATE_BUS _BITUL(4) -#define SER_RS485_ADDRB _BITUL(5) -#define SER_RS485_ADDR_RECV _BITUL(6) -#define SER_RS485_ADDR_DEST _BITUL(7) -#define SER_RS485_MODE_RS422 _BITUL(8) +/* Placeholder for bit 3: SER_RS485_RTS_BEFORE_SEND, which isn't used anymore */ +#define SER_RS485_RX_DURING_TX _BITUL(4) +#define SER_RS485_TERMINATE_BUS _BITUL(5) +#define SER_RS485_ADDRB _BITUL(6) +#define SER_RS485_ADDR_RECV _BITUL(7) +#define SER_RS485_ADDR_DEST _BITUL(8) +#define SER_RS485_MODE_RS422 _BITUL(9) __u32 delay_rts_before_send; __u32 delay_rts_after_send; -- 2.11.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel