From patchwork Wed Oct 11 17:38:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lino Sanfilippo X-Patchwork-Id: 732397 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 F0832CDB473 for ; Wed, 11 Oct 2023 17:39:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232766AbjJKRjQ (ORCPT ); Wed, 11 Oct 2023 13:39:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38660 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231375AbjJKRjO (ORCPT ); Wed, 11 Oct 2023 13:39:14 -0400 Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02on2088.outbound.protection.outlook.com [40.107.249.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 98E7D98; Wed, 11 Oct 2023 10:39:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YnZ7gbPricR2ACpOXheK35H30OSlirJ0sRNbq2BNUfprgmFlHc5svTR/vhVwz/oMUzNFf2SBvMYTVv0/hLDqXQaE4LU6IB3cgv2NenhNH0TUV7Md/vdcFYonDchSbNXvJfemsErOLod7M4N/EIRpzkQTMH+yRF/o1yQJ9v4QVHZ79MhVL/JD46C4N29JIWJQAhA9E6d5TJdWfV8UA0qi2elJD6d8b6vWpCP3QPcXDSYqWK4oIuGPuY4nOGW0oS5LoyDQVB284vkLuaCK16zb1lX/l8gYbz2AQGbz6eGuxTnGyZ19TFXUwJAWEL5YFklTSwmEui+ZhRbzNzJoh9Y3eQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=4GdkgcY/GaYzPupCbixjzBwTpe3yNotCFgwLRCoSCFU=; b=Hc0wO1p8od/ZkpnVeH7OPDF00CHci20/YQCmtTkncw/PeMnydGLK+14VbL2Wphol2WGL6NOvw/gYLqybZk7kaU2Go55Mm70lJymAuWTr7COWD1dM59QZ0wRS3DUx/vQ3tTeCxIPrNJsCeMI02MIOfwwXhWo020h+OfwsmDPClTf7MylxcaXlogb/Qm0EjGrzDTvQUiaO2uCpkpF8NLcYOD7lceaG2f270psOyKaXzRVzKfI/7ZJBntcPzRxveQ5simEK+O60neNaYCeTr6tFyRA67J0hVsoLUbk8k+pCKYYby5kP1/ep82lMA6PEmRQf++eJnyv+WrZ/OsHfgJDUHQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=kunbus.com; dmarc=pass action=none header.from=kunbus.com; dkim=pass header.d=kunbus.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kunbus.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4GdkgcY/GaYzPupCbixjzBwTpe3yNotCFgwLRCoSCFU=; b=MJxAlVUKboAjc3pnWKf5Qx6lgDT0aXgANdEfYhea3qRmKVX1/GNlL6RX41RZohYRzbvHNf9khEqd94g9qhsHs4QwA3uAV0hAvDUFZOA4ERQLEWTXm6s9oNqRbp0WS0zqR0MACmPPvIMOrJMYJ6h5EALzxJ/p6863t7nPjp/eKyM= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=kunbus.com; Received: from VI1P193MB0413.EURP193.PROD.OUTLOOK.COM (2603:10a6:803:4e::14) by AM8P193MB1187.EURP193.PROD.OUTLOOK.COM (2603:10a6:20b:362::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6863.41; Wed, 11 Oct 2023 17:39:05 +0000 Received: from VI1P193MB0413.EURP193.PROD.OUTLOOK.COM ([fe80::550d:2425:c0ed:3e59]) by VI1P193MB0413.EURP193.PROD.OUTLOOK.COM ([fe80::550d:2425:c0ed:3e59%3]) with mapi id 15.20.6863.032; Wed, 11 Oct 2023 17:39:05 +0000 From: Lino Sanfilippo To: gregkh@linuxfoundation.org, jirislaby@kernel.org, ilpo.jarvinen@linux.intel.com Cc: shawnguo@kernel.org, s.hauer@pengutronix.de, mcoquelin.stm32@gmail.com, alexandre.torgue@foss.st.com, cniedermaier@dh-electronics.com, linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org, LinoSanfilippo@gmx.de, lukas@wunner.de, p.rosenberger@kunbus.com, Lino Sanfilippo Subject: [PATCH v2 2/7] serial: amba-pl011: get rid of useless wrapper pl011_get_rs485_mode() Date: Wed, 11 Oct 2023 19:38:24 +0200 Message-Id: <20231011173829.10508-3-l.sanfilippo@kunbus.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231011173829.10508-1-l.sanfilippo@kunbus.com> References: <20231011173829.10508-1-l.sanfilippo@kunbus.com> X-ClientProxiedBy: FR2P281CA0093.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:9b::18) To VI1P193MB0413.EURP193.PROD.OUTLOOK.COM (2603:10a6:803:4e::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1P193MB0413:EE_|AM8P193MB1187:EE_ X-MS-Office365-Filtering-Correlation-Id: cea16201-84a7-4859-cad4-08dbca80f72e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TRs833aB0CzXkuyGa32oC1obW3+IQ/WEMrvnuVu6mheOfUuAve45hx2o5X08kbVf9QzDyh29KLK1MkCA911bjBO0GxfSuM/0ShiUgC06Dy7wJTD0NuEHqMJ1gDcBTFubtoduNMgAhaPVzkFiM7WmSIy2YFMZys5tJtvCNogtUaHbk7DTD8pCNDb1DOtHCZ9XotZL0128ZCmcG+0xCHIPyL24oaHOYzugkkpx5nD+pNN12H/RIjohBYFvCwy0CLEXOYf3dzBPqMr17diq8csXGlus2tEk/+HPNXootosn89MGbW1rcvSlEwG3Xl/1CgIBO9RF3hlqyVP77PwQXcOdOQHJer7GsgS6Ub1zD0QKMhamhvGk2UHUD38iGTYIGRJIqvD+EBcfLIjBPXPCtKpWaECbJxsVS8n0MUXnxnxep21BbMb0m9FGNIajDVXjZskVrk/PSlHYd1TPaYnRiDTLTJnrUw+AnTl44J92ygzEz2vulsBRXhbwgUmIS0kdKLSWn2BeeudQMqbxPPgo8a+KQRC+ACB1qrxcAlmKFafOuYRT2ZdeDfc0wHVgi3I+mBCd0NN0KCT9ukea+nZVAGkfYwRZABzNbWWl9XsZt2O4xiI= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1P193MB0413.EURP193.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230031)(136003)(39840400004)(376002)(366004)(346002)(396003)(230922051799003)(186009)(64100799003)(451199024)(1800799009)(6666004)(2616005)(83380400001)(6486002)(478600001)(1076003)(107886003)(52116002)(38100700002)(6506007)(6512007)(66476007)(66946007)(66556008)(4326008)(8676002)(8936002)(41300700001)(316002)(86362001)(7416002)(2906002)(36756003)(5660300002)(26583001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: zcsL/23QVWB3aLyfKslCBBRVJue6luKUKao4dSgfWqnRx1T4Y0KfquhU9XI5SnW1Vsvi+mxhIcugYOwGR3uzZ++JWX22S2r94PXe6zSxzXFkr/HDTFecIsa0m5u+0mFW7opetsk9wTh8e4vaNlEBPByWeLvJRdTf+RxidIjm7Pe3uY40l9KOwOyjobmtbBicOW1SvM9hugIkugbTyh4RYjzK/fYt/wMqwljyfwlKE2Hi6tZPsNLNnzCi/1wCL0WEnT8nAHSVpMPDJMKDFP70kEtx/1R1UCAAnjiGB6LgU3LcjQj4HnOrCbGbD+zhCR5UXVSIG1+eZWhe+M6MW23kdDsgFMmi8/GE28oyUz5aX7Ujo5wp84dwI4oSkXltuJ6Wxmd5RfZiOy2+lPBBZ2c8UpodJzh89WMSyIzsqnib8rlflufo5EWIRn/lVD5qvqoOCD4QDct/GZa9APiMJEu9qlujzOS8e6GboU6QiT3DV1v9qR2ffsanSZ739wE2mEP0K2A8L1DdR3bLURhTeeq0E1Dm1rPQ0I5uH9ztPUBdJE02BxZDmiRYKjs+fjV0Vw/cxAhsem0+Nac3Pf7OEPfJ6LhwCYyGG4blG9QWSdPoZqGyt97PkjxWtFJJlEjgyJT+cHljovy9PRlBx5DI4OK8XLLIWZ9oqMCfRdlHN6BgFJzMNhltyS6jOcp1I1Bb982sQpcZ5PQaQ+1rsHJM3P9GguoTry/x5FHGmI0GPFw6mm5oP7CQUAcehB2qckvqB9dzQi6urlBcyCTn1Qq8o8ZcD+Z7hC/R1aSZUEqh2JxSlQft+AtW8Xl0icOwxiF6SFYsYZkVJ9kW5GUsSsDTVrrgIBqPnzyRRNRhY+VyL/UFrrs9SzJeQEXQ25J5YzBVmebLE10NNOUvt9UjMvJhBS8lvrMcDgXBfZOd7QygIV52xTxecY282ph3EAKERVyBHE8bOsaMxOGRQHD+UQFEB71A1mB5MAuOnnr2y2kJI5jiee111Xa/b0qClrR6Gr4kIe5Vox64ozsqTOO97q+Y29rvzVHizqDTxrzhzALW4jwxCRVIdwYCatEWbMMANdr+DeooYGDwJQg31+Zcf9OEAxFfm39D5lnDURWRsnWnPMOtcTX8w/OF3AUJdFN+032H8pXNxnb0EeusiWxjZ9jnBI0SdLSNGlXPsmaypHwlYUNyy3YqAcefpgbnxXSGIHsevaDTK1f0GrRVj2VxvN5qWzVeUF2JWLkUss+s7khwJi4LlmZW56AfAFlm6+GbsqUJxX7e0ihhdGMNkFKGk8jqIV81L5+ibZi0hqfeQGqpRj4jZP8IX0uoSI9GkXnFxOsPx/txhPoZ56QWkOSP6Z/6gV6caf1PM8Ggr4I20awruW589HQvUVoYbEi8qEp8P2F8DcT9Ibet1l7PeWG1J5pGEEAkBMIxfyisSHplwlfzOZbQGhbMGLFlAW9ZJ9SymojFG8hi5tZHhrZOZo2DoJfb9ekbicrd7EU29mR7Q03aCLeJCPlrR97Ef18xmZrOxydBpL72WXRpgfavxphERduVQFqSlEvqUQQwqrMkT8mgDa7nypEKDp1dF/dE8RgmpDpOGpoPIQv01Cil3sucaJ71mAavoBwyeY1yu+NYyNFFHEGDccbxpREEvanmDq1cDU2zrh4J X-OriginatorOrg: kunbus.com X-MS-Exchange-CrossTenant-Network-Message-Id: cea16201-84a7-4859-cad4-08dbca80f72e X-MS-Exchange-CrossTenant-AuthSource: VI1P193MB0413.EURP193.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Oct 2023 17:39:05.7071 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: aaa4d814-e659-4b0a-9698-1c671f11520b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: QqKcf8aIXkPvFHHLJr5O8xrqz3WCbhdSGh6CROWO06UVsrv5qxNHuWewcD9k4AqsGusLnzSKB9a75bBiLL44fQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8P193MB1187 Precedence: bulk List-ID: X-Mailing-List: linux-serial@vger.kernel.org Due to earlier code changes function pl011_get_rs485_mode() is now merely a wrapper for uart_get_rs485_mode() which does not add any further functionality. So remove it and instead call uart_get_rs485_mode() directly. Reviewed-by: Lukas Wunner Signed-off-by: Lino Sanfilippo --- drivers/tty/serial/amba-pl011.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c index 3dc9b0fcab1c..70b44f3e9eb7 100644 --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c @@ -2716,18 +2716,6 @@ static int pl011_find_free_port(void) return -EBUSY; } -static int pl011_get_rs485_mode(struct uart_amba_port *uap) -{ - struct uart_port *port = &uap->port; - int ret; - - ret = uart_get_rs485_mode(port); - if (ret) - return ret; - - return 0; -} - static int pl011_setup_port(struct device *dev, struct uart_amba_port *uap, struct resource *mmiobase, int index) { @@ -2748,7 +2736,7 @@ static int pl011_setup_port(struct device *dev, struct uart_amba_port *uap, uap->port.flags = UPF_BOOT_AUTOCONF; uap->port.line = index; - ret = pl011_get_rs485_mode(uap); + ret = uart_get_rs485_mode(&uap->port); if (ret) return ret; From patchwork Wed Oct 11 17:38:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lino Sanfilippo X-Patchwork-Id: 732396 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 33185CDB475 for ; Wed, 11 Oct 2023 17:39:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232919AbjJKRjS (ORCPT ); Wed, 11 Oct 2023 13:39:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55180 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232848AbjJKRjR (ORCPT ); Wed, 11 Oct 2023 13:39:17 -0400 Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02on2088.outbound.protection.outlook.com [40.107.249.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7187E98; Wed, 11 Oct 2023 10:39:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iRuXSixgPJs38mZPzNP6C3nsOavSxOGX7lo1/WGijZnlDlRQ8eWrxxxf1W5s4wgsX+daCazjDoNk0OfHsJzU5zHmwJv59nuV1Irt3sqSpAzTt6XOUI14gX4vxqqKFz0DRVxQ92W8xdnKI+3wReLTqeXzcrJsbAb2MurBHUq5v+GDT8d1ObwPgT78MRufFnn6e+VTWTaeFZyRR4iMXaR4MdoTSt8NaHGrnXKN8droefuyWzWrPa/X2EBSK5n/f0/KGUgXgk9Nemg4WkpziIbimHzdJ74Si8SZwA2kNISu53wqk0WSoKQ3P2hnQNvLCIGB+4ujk7jcNRG4Q8g0PrDGtg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=oK48PGvsIKhBF+d21ldU+Id6JckShcS/hsDClCbGVHo=; b=OT74+xrYWxE5LGaSillEvi+mLxhaZtkyCcWGYjfWMFCUdR7f/FkIFke2SpWEjp7IAOUU9CIGUzWk3s4FH1GtZcdPTv7dpepdlNYRA6IJh+cOju2UhDv3EHe1iCQMQQDWvaTtDWlGcXXb8dNVqDdI2JsrV+M0FQSgvNcWVabDo+J27fa4vZ4dV1S4OGG9880eh/18gZ/tKu38kkGM/ubCpWY/cV9tdRAs03pg1mtdIDl4InnSu0PH2Sqhuf6EkjZFnnEHctOai0ffUDm0I63BzltP9DW3uDDQKRp8/fv7C99WAUSPV4F5oW/COXndoYngLuuOqEyQS1rrU08ENJ0UJg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=kunbus.com; dmarc=pass action=none header.from=kunbus.com; dkim=pass header.d=kunbus.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kunbus.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=oK48PGvsIKhBF+d21ldU+Id6JckShcS/hsDClCbGVHo=; b=0TSnZkBH9ERhP96Zj9iw3FCyjuI4u8zhWICab8u/G7kBmSaPMRW2f97ngrPpPgUoszJPWWS9F+ZTJeUSwfNCOWV7acV4WScw6KsVT9UfeVl7DTyeGNycu6Vsl2R6KnL6XS+MA1zdDe6AiJHi4849dzzkpBITpQIVWRHhyiiPg5Y= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=kunbus.com; Received: from VI1P193MB0413.EURP193.PROD.OUTLOOK.COM (2603:10a6:803:4e::14) by AM8P193MB1187.EURP193.PROD.OUTLOOK.COM (2603:10a6:20b:362::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6863.41; Wed, 11 Oct 2023 17:39:06 +0000 Received: from VI1P193MB0413.EURP193.PROD.OUTLOOK.COM ([fe80::550d:2425:c0ed:3e59]) by VI1P193MB0413.EURP193.PROD.OUTLOOK.COM ([fe80::550d:2425:c0ed:3e59%3]) with mapi id 15.20.6863.032; Wed, 11 Oct 2023 17:39:06 +0000 From: Lino Sanfilippo To: gregkh@linuxfoundation.org, jirislaby@kernel.org, ilpo.jarvinen@linux.intel.com Cc: shawnguo@kernel.org, s.hauer@pengutronix.de, mcoquelin.stm32@gmail.com, alexandre.torgue@foss.st.com, cniedermaier@dh-electronics.com, linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org, LinoSanfilippo@gmx.de, lukas@wunner.de, p.rosenberger@kunbus.com, Lino Sanfilippo , stable@vger.kernel.org Subject: [PATCH v2 4/7] serial: core: fix sanitizing check for RTS settings Date: Wed, 11 Oct 2023 19:38:26 +0200 Message-Id: <20231011173829.10508-5-l.sanfilippo@kunbus.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231011173829.10508-1-l.sanfilippo@kunbus.com> References: <20231011173829.10508-1-l.sanfilippo@kunbus.com> X-ClientProxiedBy: FR2P281CA0093.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:9b::18) To VI1P193MB0413.EURP193.PROD.OUTLOOK.COM (2603:10a6:803:4e::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1P193MB0413:EE_|AM8P193MB1187:EE_ X-MS-Office365-Filtering-Correlation-Id: e6788358-77d6-4af2-aa7e-08dbca80f7f4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nbRLNG4Hp5hrGIXlig/UQx2qtT2mYfMPwchd1VWf1a1z5+eAsHTwnk4Iy1CUE90jo9TV4un2CXIEUJrix47SHMoHplkwxEJr1ruL5aCJSdlhvEFnR+DckRMDleUYxs/WeU4k+8CvUXWvnGXB6ZLDA/Ctod54VDqg3CiJR8BrS91vFFK6hOBm/rlCuozxLl+Az6IRMb18RZ7HtM8NNx30G9DSAe5rmqioNG4mfoD/QcGVKA8xt+GjolbnjPBeZhjFOFq5a0BjqNUEGbO2ksCyD/gBrmZeOfDTGAmYCgT7pqg8fSyqcPekLnQ4dUR5XPNe5EAeiT+cSFGlvfFz9wjXkWXfXfJ4Rm6UPHQh9+9UD09zirbFGAhjMmGAvfHtZfidfkeUZQ1Uihi91DHW6ZSPp9Ij8GFU8u/V+rNwWUF6R2CYLaMBTZ9BA9XURhjZOhBPqmePSQ0h4xhzVWbElJt/04w7yxijKbUPvbwuRI7Vxpio1EIJ7vJE101yfLaj15ii0Pf5qBMHTUhSpiPMl/qpVWjhIjSQiof6i7rRpmXGFAgwKfz66eyStLKq55hjz8ob X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1P193MB0413.EURP193.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230031)(136003)(39840400004)(376002)(366004)(346002)(396003)(230922051799003)(186009)(64100799003)(451199024)(1800799009)(6666004)(2616005)(83380400001)(6486002)(478600001)(1076003)(52116002)(38100700002)(6506007)(6512007)(66476007)(66946007)(66556008)(4326008)(8676002)(8936002)(41300700001)(316002)(86362001)(7416002)(2906002)(36756003)(5660300002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: heBXJxpCyGJj/bqZnix+xga6zMxVHMayjk9sHXCAlKiBqySPMbeQCqJohOCe3AJ1j9Dcfa4ZXsBrbkwO/7AbGWmPMsmKXlAirgdm3PmrZsXnNdjTn11eUMZfEI9zu7IgpKoqrq4wrHN4Dah4rjuu3V7K6DAFP/4M8yM3yVISz2jIpkGK1O8QPz5UJUdXPD0JW6jc0vw4eVHV4Y2ti4LchO9pkCUG3XoCBGnUyxfk8PipLGc6BzeZven5CCY/GSQrVdgUoBrK4rhV8mTHcRG8051bWREcyK9RczTLhJP4CZUHw0E21LN2NPGMz2PzjyGWn7esFuBaBXsK/X1VbIwwAo+ZS0+lzBkrRImJKxHOe3eO3KdfB029fE+cd0g5n0+cef0Wcfr6FUcXnezQ0elZKDlhsZ91hJo4Vf75XALH967+qP6iYHB2fkrZzU91R+w3bDfEr7sC0ocdW5/iN4T4l0ZmQKrbPGDh2iFrelgZCqUXRzwPt9sQVOo45hThZGU1PMsKkcwTceHAA1d40efSdTkCjuXn3GbvAv3JNOyW7wwOMJyVti3uZBgsHWcBGkGj90vIfhOUPm1ciaEPDTtLthMqs2ks0eM7UxHWqTSsO0Ov7Pv123R3JNeRAt4IGMaEWTsfz778gRfZ9ZI5kb+H65m37gi0O2n74FJVdKMuSx38MLA1rDUFPuenLrWmB/4G2xU15nWekrRzRpF/iErbaelEa5Qe/0mmJHW7zS5qlaVvJcbpzwXmPJiBJMBzzF5GcdARZd8yapAKgyuT8PVg0uBIZFUIl9LnqGTNsosh9xwJqHPTdr3gvnEViyy08LBIKQjynY401ga+JEuZtSfQPzVPxB6AIYe8TswljmUdeZ/VUYkZ0GdautUIkldX3Q0tR0C9AE4S7knKc2iVtZ3mC60F/aaX3AgT7iRQO4pmNR6jaZ2Qke6lIDqLgKNwoAnmQagDls+7V5QMvfMISVY3A1dsLc7zEHyyPqEIwzCDjdG0YQxXIexVI1e52QHyhPMK7CrLesmOLF/7gv/9oxXG+SGfx4WAYzj8J3lCqbQHrQatLcyGW70Xoo7+DcGRu6+aGkRHucxWQBCZxUSQZ9Hg3L1q/hCH08siTn2aQ/FJHzvRqgHRyms+EVVmGrg0FYBL860GrZ5BfHYvHUQrxUASNwdyAujVpdF4dlxpGkr0x6QpPa145BN/Zm+QrRrStDbAPOlKtcUdS72Q0JwwfV1JwFsY2VBnRuiuUBeN3oD4VWsY24ti+zI6YYaWlKjNyoLQFanxxA9FLwnsxyGLbEu3ZX6CfOKfo/l/7ZS0nGjDpSdR/DqCFTZB4JhKjuAYqWoGXyB5h7j29zClBuEdXDQHg8mWw875Ue71G5QDriEoN+P7kVcEaLCoL3tPQ9V7M6lsLn0a1NtU6ur43GIEQ4voOgTFTy3uMNPZmvfijBKrlxoGXASAe6q0bKUdjEQv8ifWqp9J9D9Mjg4TpOsLTUIkt1s2ScBWC4W6T5ZGROehPIq0XQNYKoFh+Jc59TGzyT+2Vaw+lStHXLUzIpoQ09S3c/MPUn9G1owUuyxgPq2ZUUfW+PSxVj5u6Xsd/WK/NTYtKfSniodYtSd/G5kBs7dI1Qwocmi7aUdCyOTvIZfn57J4yXVZoxKIDjtBogvjDBIs X-OriginatorOrg: kunbus.com X-MS-Exchange-CrossTenant-Network-Message-Id: e6788358-77d6-4af2-aa7e-08dbca80f7f4 X-MS-Exchange-CrossTenant-AuthSource: VI1P193MB0413.EURP193.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Oct 2023 17:39:06.8742 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: aaa4d814-e659-4b0a-9698-1c671f11520b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: nwcIsKvEWDJB60NZDevImlIlIArjzwRAk2TI0VUJm+jC7T4F9YtwmyERbmVAlrBwdx/VfE2IHzrPSCtJZvYaZw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8P193MB1187 Precedence: bulk List-ID: X-Mailing-List: linux-serial@vger.kernel.org Among other things uart_sanitize_serial_rs485() tests the sanity of the RTS settings in a RS485 configuration that has been passed by userspace. If RTS-on-send and RTS-after-send are both set or unset the configuration is adjusted and RTS-after-send is disabled and RTS-on-send enabled. This however makes only sense if both RTS modes are actually supported by the driver. With commit be2e2cb1d281 ("serial: Sanitize rs485_struct") the code does take the driver support into account but only checks if one of both RTS modes are supported. This may lead to the errorneous result of RTS-on-send being set even if only RTS-after-send is supported. Fix this by changing the implemented logic: First clear all unsupported flags in the RS485 configuration, then adjust an invalid RTS setting by taking into account which RTS mode is supported. Cc: stable@vger.kernel.org Fixes: be2e2cb1d281 ("serial: Sanitize rs485_struct") Signed-off-by: Lino Sanfilippo --- drivers/tty/serial/serial_core.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c index 697c36dc7ec8..f4feebf8200f 100644 --- a/drivers/tty/serial/serial_core.c +++ b/drivers/tty/serial/serial_core.c @@ -1370,19 +1370,27 @@ static void uart_sanitize_serial_rs485(struct uart_port *port, struct serial_rs4 return; } + rs485->flags &= supported_flags; + /* Pick sane settings if the user hasn't */ - if ((supported_flags & (SER_RS485_RTS_ON_SEND|SER_RS485_RTS_AFTER_SEND)) && - !(rs485->flags & SER_RS485_RTS_ON_SEND) == + if (!(rs485->flags & SER_RS485_RTS_ON_SEND) == !(rs485->flags & SER_RS485_RTS_AFTER_SEND)) { - dev_warn_ratelimited(port->dev, - "%s (%d): invalid RTS setting, using RTS_ON_SEND instead\n", - port->name, port->line); - rs485->flags |= SER_RS485_RTS_ON_SEND; - rs485->flags &= ~SER_RS485_RTS_AFTER_SEND; - supported_flags |= SER_RS485_RTS_ON_SEND|SER_RS485_RTS_AFTER_SEND; - } + if (supported_flags & SER_RS485_RTS_ON_SEND) { + rs485->flags |= SER_RS485_RTS_ON_SEND; + rs485->flags &= ~SER_RS485_RTS_AFTER_SEND; - rs485->flags &= supported_flags; + dev_warn_ratelimited(port->dev, + "%s (%d): invalid RTS setting, using RTS_ON_SEND instead\n", + port->name, port->line); + } else { + rs485->flags |= SER_RS485_RTS_AFTER_SEND; + rs485->flags &= ~SER_RS485_RTS_ON_SEND; + + dev_warn_ratelimited(port->dev, + "%s (%d): invalid RTS setting, using RTS_AFTER_SEND instead\n", + port->name, port->line); + } + } uart_sanitize_serial_rs485_delays(port, rs485); From patchwork Wed Oct 11 17:38:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lino Sanfilippo X-Patchwork-Id: 732395 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 1BC7BCDB470 for ; Wed, 11 Oct 2023 17:39:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233024AbjJKRje (ORCPT ); Wed, 11 Oct 2023 13:39:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55248 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233183AbjJKRj0 (ORCPT ); Wed, 11 Oct 2023 13:39:26 -0400 Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02on2088.outbound.protection.outlook.com [40.107.249.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 82388CC; Wed, 11 Oct 2023 10:39:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XAh2drSLMhIDGnpgmbeR5QxKNfoLgrTmzxZj3wqU08yayWnBU4t3w03PaPJG/8GPpIhBSSSjtzrVAZIhlsGd1y1qzYbyJU/XEvj90rbrQyZSGhqq5e/X5PaYYIq96gyZYd2zCeC3Obxh1wk4O7fxfGv/UAs5XKrZ1Qu3SKZHRXj0B25LpNvRhgCPJa2b/bPqrA8gh0yRU2UfCOJts7ifoVqT24T3ROAqIFGT2oU4txiwI3HcuenRiaFr+RheOEWhtwlMl1IbLhCJiUkrY4sGj/nXB4sqWawIF5Swf9t49O9SnNESAt+n6j/Pbk1qS3NA7Vkg3ytrWuTFxBmjQ6rwTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=g9VNnrRh+93b9tiZ7+fqQ29BWG2jfMJ+okhxSduWaaw=; b=bBeAblgk4q/AM/hZYIdL5SHKWSx35276mQ/idQ9keKNchocVM+RCfsW4IH8pAeb1U9nxV9CTA3Xy+jG9kH19mGjSjpoVNO1bq8oORQM/VxgZCceBR8+2t0Jz51jlXMvZkNqmvWxcGXyDIK3Ls0dp1KSGd196U+F+soorjGPJeDOvyMT8e3W9ESyw/lHF17hAZHw0ZSVWVBrxhzx7vHyYUeujv6cvmzNNKBMCyiXtO06vbmC103NAfpm38e/bmr2GXsu2EE2rgTL3GQ4WCssnDqTEKThE0T9s4gWXeA+dofGXBUjBNoUI94FfI8vtpJ5hFJdBDjSTXwrhAT/4toGgpg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=kunbus.com; dmarc=pass action=none header.from=kunbus.com; dkim=pass header.d=kunbus.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kunbus.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=g9VNnrRh+93b9tiZ7+fqQ29BWG2jfMJ+okhxSduWaaw=; b=aAO/cdrvJeQ7KrAch7thEVyxuqGaSN5jU0IxrAIquJXnO8kRwSMYGd7C6IAOGlWthsjeQjg4CaLu066BgAS94rUJV6pf3jb+0BBp9vmkc0lAeWoP5zeu0RG8nlJ0Hbvj4GWsdubrWf1HrcEW41rfoYNxzKwY2nfCpixV+2vM9KM= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=kunbus.com; Received: from VI1P193MB0413.EURP193.PROD.OUTLOOK.COM (2603:10a6:803:4e::14) by AM8P193MB1187.EURP193.PROD.OUTLOOK.COM (2603:10a6:20b:362::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6863.41; Wed, 11 Oct 2023 17:39:08 +0000 Received: from VI1P193MB0413.EURP193.PROD.OUTLOOK.COM ([fe80::550d:2425:c0ed:3e59]) by VI1P193MB0413.EURP193.PROD.OUTLOOK.COM ([fe80::550d:2425:c0ed:3e59%3]) with mapi id 15.20.6863.032; Wed, 11 Oct 2023 17:39:08 +0000 From: Lino Sanfilippo To: gregkh@linuxfoundation.org, jirislaby@kernel.org, ilpo.jarvinen@linux.intel.com Cc: shawnguo@kernel.org, s.hauer@pengutronix.de, mcoquelin.stm32@gmail.com, alexandre.torgue@foss.st.com, cniedermaier@dh-electronics.com, linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org, LinoSanfilippo@gmx.de, lukas@wunner.de, p.rosenberger@kunbus.com, Lino Sanfilippo , stable@vger.kernel.org, =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= Subject: [PATCH v2 6/7] serial: core, imx: do not set RS485 enabled if it is not supported Date: Wed, 11 Oct 2023 19:38:28 +0200 Message-Id: <20231011173829.10508-7-l.sanfilippo@kunbus.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231011173829.10508-1-l.sanfilippo@kunbus.com> References: <20231011173829.10508-1-l.sanfilippo@kunbus.com> X-ClientProxiedBy: FR2P281CA0093.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:9b::18) To VI1P193MB0413.EURP193.PROD.OUTLOOK.COM (2603:10a6:803:4e::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1P193MB0413:EE_|AM8P193MB1187:EE_ X-MS-Office365-Filtering-Correlation-Id: 7563fd0f-131b-4ca1-b310-08dbca80f8a2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 58WR2e9qytcd68wapZlInQB0RgQtzyhh+s/A+CUeJqJIyQS5PDGb8QgP/UiSxn1AEwkKSBVfKkCRiuOPoMuGKL/ImF+7QakoAuPjZQ6Tqxh2h3DB3CsmMIzfPJ3kzFv8YIHmt6gBwyOZOy0HZSGXCzKDtJpYMvMhVdeV9br2L1j2ZO5XI44Sg15Dy3i/tTkvtt6MhGirONesdrUfTQMF6dh5HIPMD/uRuRjZS7rwCwWYaYmr4L9TKrLJ505rcp7tS/66/h6CiEKc9o1hNumk13Y6MJQ0RUR51cjqxwIJSHXWYJGOOy2oR7iJPg7zHWrSKWNxSSH5bTdYSk5a4yugE2Cy8R+5Aoigufm258uoiFFZx+vG7of2XhQiLj4vvgLoVyossx52PvcLWjbxhzOAaL6s8qNEo0c9fRyQ4cZz5fciwv1IEmQDSUqMB5+FjiNoMjTKCtZmbiSkaJDoOj9HnVdPqXzHDgu6f1tnvGU6CXTLIctzDZOBhUojrKTBWiubJjfXYZSg4kciB1fb3rVz/ELrYeymehic3t+gi8k9JOnMizht/BHHp9uCgPNYLTHQ X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1P193MB0413.EURP193.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230031)(136003)(39840400004)(376002)(366004)(346002)(396003)(230922051799003)(186009)(64100799003)(451199024)(1800799009)(6666004)(2616005)(83380400001)(6486002)(478600001)(1076003)(52116002)(38100700002)(6506007)(6512007)(66476007)(66946007)(66556008)(4326008)(8676002)(8936002)(41300700001)(316002)(86362001)(7416002)(2906002)(54906003)(36756003)(5660300002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?3XLJh4itFinlueTudjCJxV2NwAwu?= =?utf-8?q?W+9unnrk7N0+M92K5pkhOGTltrOGD8KLdCcP5M8d+6sQ4td2fcixlHfIJ0eYZqBTF?= =?utf-8?q?JZPveht/efI6SEx3JlfB952MUOYRWgK6Pz6QvTX2CRa2y55tL9lkebVf6BrHqur+/?= =?utf-8?q?4Pz1AiNLyBTj/kLQvoHaZqBXTj5mPo9sg+OI9a9ru3T/rsGij3nECL8+XSCLcCsLi?= =?utf-8?q?3FhKey00AtI06q9PDq8Zd1/vbkq66rwFOGSwpxxLvz8YsP0ItoDUwKnuu85d2y45d?= =?utf-8?q?x8j+QA0ZHJZRrAl4/rPtF5ESEN1MxG0UyoAjPcpu/fgcW+TC/IaBNK6ppP2bvuWEz?= =?utf-8?q?r3MzMEW53VbNt8lO9CWx/+L/q5v5NrPD9+pioSg+6UYkI3G4CMGQKVRQKdUEGI0hW?= =?utf-8?q?MfhYjUheTv2OZ5R/H+yXXYlYaWjyf4QGr1T4Zf7tdtsuNcojevZlexwNx5y8bYqLW?= =?utf-8?q?hCtfBPMNYuW7YRBqD8gVZCPQAtcKbWHSp8cJgwAg0TPpU95uEzGS+P1HEohdPS5u/?= =?utf-8?q?S9QmaYhGB72wY8H9KlCzv+CJvaPlojHbav3HJyrnrB6OH3zzIPkqHPG6+chufALqT?= =?utf-8?q?IiuHAAfLMACK9UfmXGIeHmVa4ZIdnjxf8HNitSWz6Q/NmxV4GbL++56CGjH3R4bis?= =?utf-8?q?hLGbYJdn096tfrBSJH8E/73O22IMAuapsRZWf2edbFaOubaZkEg9K1xidRfgZTOtb?= =?utf-8?q?vufpLAZXjmBr2j2Cqhip4rJDrlQyoFok/Wn+nWn3UQTPhxmA3PJPtVkLGOwCE8EpG?= =?utf-8?q?vA5ZzfbU2OEK9t6OBJYCuTg2ELzfOUrySqvIpLmwrhZyWCk9M4i09VQrlQvnRfP9d?= =?utf-8?q?vuhNH7F9wkRg7AqxJMjQs+Tvvr+dUe62HIcTJjkiTSjMqQWurfR0V0dgirOvuGdim?= =?utf-8?q?tLV42TXpacWiMXwLDeB312rVEoLXKhofoh1auHurDTXbDC2sM7Kz0VEG+fp1fbP0z?= =?utf-8?q?yPTw7VV39lyMdWyATLCY+i6QYLvkjpIulSk26j4bF/ipbx4Qt6jxLytMf66M+x4Si?= =?utf-8?q?l369NkOj0YtW8QVZ6bQNYocqxYUpJSwYKLVdb2J0Lh9qp2bQp2N5S0IabffEKc1Lv?= =?utf-8?q?UkGqq8Vp6Ht19KDVtDHp4ApDORFMlih7nP9b9/tVGTb10qOdhFx91g1UaM14rZCGY?= =?utf-8?q?uowBjVQofI08LRnvB/yMuTbMh/wgF4zymsv+28/qx/ND56zxjheEEdHquJykKtRY6?= =?utf-8?q?PRua3yVoL7hNn5u5G9WHTPIlYvf97Ajk5JVrLmmHdYPc8smqJ+GmkYLJI41DVnece?= =?utf-8?q?lkWsjBVznPMbccq9QGteMxySznZalckyO/UkF+++jEMJTPXrKwM4YcyYeO0iJx9Gs?= =?utf-8?q?5uU+IvxgF4Jv6x/sk/Ag9TAoUGlOql2JpgBx/tNDkiKQ0PvpPZQUL/DC+iiXBOgGq?= =?utf-8?q?28URD/YrftBX1qNr2VRfdqu/fCXdvMKY6lcGTsjgcw+x4pLpVyCzlenbKRmiAHE/+?= =?utf-8?q?XpLlp4G7o8V/ZxGF4HHuOPveW19SfNewINDPxno/aRQdknscwy8nUezuwed1C8UiU?= =?utf-8?q?JOr4/ZBdj9UJJJPONEyNBKK6tY3cOgQDcaBeGvRCazl5t2cme45FSmvfuLvBaj9Ol?= =?utf-8?q?xOvaoQ1p8Gf?= X-OriginatorOrg: kunbus.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7563fd0f-131b-4ca1-b310-08dbca80f8a2 X-MS-Exchange-CrossTenant-AuthSource: VI1P193MB0413.EURP193.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Oct 2023 17:39:08.0536 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: aaa4d814-e659-4b0a-9698-1c671f11520b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 3G/BcBG+MR0SKgB0v9OH9fWXUk4Z96ezoa242iKnjMLz/idaDYLIuT7767KHxp4W8c/vim2rxhhbVa9f0eLhMA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8P193MB1187 Precedence: bulk List-ID: X-Mailing-List: linux-serial@vger.kernel.org If the imx driver cannot support RS485 it sets the ports rs485_supported structure to NULL. But it still calls uart_get_rs485_mode() which may set the RS485_ENABLED flag nevertheless. This may lead to an attempt to configure RS485 even if it is not supported when the flag is evaluated in uart_configure_port() at port startup. Avoid this by bailing out of uart_get_rs485_mode() if the RS485_ENABLED flag is not supported by the caller. With this fix a check for RTS availability is now obsolete in the imx driver, since it can not evaluate to true any more. Remove this check, too. Fixes: 00d7a00e2a6f ("serial: imx: Fill in rs485_supported") Cc: stable@vger.kernel.org Suggested-by: Uwe Kleine-König Signed-off-by: Lino Sanfilippo --- drivers/tty/serial/imx.c | 4 ---- drivers/tty/serial/serial_core.c | 3 +++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c index edb2ec6a5567..c8c19bf8585d 100644 --- a/drivers/tty/serial/imx.c +++ b/drivers/tty/serial/imx.c @@ -2332,10 +2332,6 @@ static int imx_uart_probe(struct platform_device *pdev) return ret; } - if (sport->port.rs485.flags & SER_RS485_ENABLED && - (!sport->have_rtscts && !sport->have_rtsgpio)) - dev_err(&pdev->dev, "no RTS control, disabling rs485\n"); - /* * If using the i.MX UART RTS/CTS control then the RTS (CTS_B) * signal cannot be set low during transmission in case the diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c index dca09877fabc..95cec2343b35 100644 --- a/drivers/tty/serial/serial_core.c +++ b/drivers/tty/serial/serial_core.c @@ -3576,6 +3576,9 @@ int uart_get_rs485_mode(struct uart_port *port) int ret; int rx_during_tx_gpio_flag; + if (!(port->rs485_supported.flags & SER_RS485_ENABLED)) + return 0; + ret = device_property_read_u32_array(dev, "rs485-rts-delay", rs485_delay, 2); if (!ret) {