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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, 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 AE07DC433E9 for ; Thu, 21 Jan 2021 14:26:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7C8D2239D4 for ; Thu, 21 Jan 2021 14:26:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730059AbhAUO0f (ORCPT ); Thu, 21 Jan 2021 09:26:35 -0500 Received: from mx07-00178001.pphosted.com ([185.132.182.106]:46279 "EHLO mx07-00178001.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729502AbhAUOYc (ORCPT ); Thu, 21 Jan 2021 09:24:32 -0500 Received: from pps.filterd (m0046668.ppops.net [127.0.0.1]) by mx07-00178001.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 10LEMvnx030032; Thu, 21 Jan 2021 15:23:24 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foss.st.com; h=from : to : cc : subject : date : message-id : mime-version : content-type; s=selector1; bh=U9FsoHzVxU/pOZkbNb54dcTo9vqdTnlxm3Qvz96EFUQ=; b=yffoLAJ2cGRHYuI3VMDCfwYdGF2LUYCb5hhpRXrfiXQvWfXMHz+mrExrYaR+p0CIlUC4 QYfxXyUfN22XSlYxmtscEuJ+RRidQ8KEy+IcJbIHBEJz+Rg6scKH+HjlAquMcOdjnlIU mF7FfDO0kAFXwckve10ZonSimYYEZEVeyCtul9FWz/+7qNiOGtqAlP/98kMOJpWmX/ra MxPBbYi5sbDokKrEKEFE0RrVYLCWo6Klc1qh2lYdpeczlm0CCTrlSqwIJXzb1CUWnw5z +kRZcZc5ePOj5Aaq32Plgf+InO+hB2GMSHE875pPWOF/jxxvcALzvKHvhj3tDWqo4KKS sA== Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx07-00178001.pphosted.com with ESMTP id 3668q03nr3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 21 Jan 2021 15:23:24 +0100 Received: from euls16034.sgp.st.com (euls16034.sgp.st.com [10.75.44.20]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id E231B100034; Thu, 21 Jan 2021 15:23:22 +0100 (CET) Received: from Webmail-eu.st.com (sfhdag2node3.st.com [10.75.127.6]) by euls16034.sgp.st.com (STMicroelectronics) with ESMTP id D011F2AD2D3; Thu, 21 Jan 2021 15:23:22 +0100 (CET) Received: from localhost (10.75.127.48) by SFHDAG2NODE3.st.com (10.75.127.6) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Thu, 21 Jan 2021 15:23:22 +0100 From: Erwan Le Ray To: Greg Kroah-Hartman , Jiri Slaby , Maxime Coquelin , Alexandre Torgue CC: , , , , Erwan Le Ray , Fabrice Gasnier , Valentin Caron Subject: [PATCH 1/1] serial: stm32: improve platform_get_irq condition handling in init_port Date: Thu, 21 Jan 2021 15:23:09 +0100 Message-ID: <20210121142309.6327-1-erwan.leray@foss.st.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.75.127.48] X-ClientProxiedBy: SFHDAG2NODE3.st.com (10.75.127.6) To SFHDAG2NODE3.st.com (10.75.127.6) X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.343,18.0.737 definitions=2021-01-21_08:2021-01-21,2021-01-21 signatures=0 Precedence: bulk List-ID: X-Mailing-List: linux-serial@vger.kernel.org Replace "ret" variable by "irq" variable from platform_get_irq condition handling in stm32_init_port as suggested by Jiri in "STM32 uart cleanup and improvement" series review. This change will prevent port->irq to be unexpectly modified by a potential change of "ret" value introduced by a new patch. Suggested-by: Jiri Slaby Signed-off-by: Erwan Le Ray diff --git a/drivers/tty/serial/stm32-usart.c b/drivers/tty/serial/stm32-usart.c index 6a9a5ef5f5ba..dde6d526362d 100644 --- a/drivers/tty/serial/stm32-usart.c +++ b/drivers/tty/serial/stm32-usart.c @@ -981,11 +981,11 @@ static int stm32_usart_init_port(struct stm32_port *stm32port, { struct uart_port *port = &stm32port->port; struct resource *res; - int ret; + int ret, irq; - ret = platform_get_irq(pdev, 0); - if (ret <= 0) - return ret ? : -ENODEV; + irq = platform_get_irq(pdev, 0); + if (irq <= 0) + return irq ? : -ENODEV; port->iotype = UPIO_MEM; port->flags = UPF_BOOT_AUTOCONF; @@ -993,7 +993,7 @@ static int stm32_usart_init_port(struct stm32_port *stm32port, port->dev = &pdev->dev; port->fifosize = stm32port->info->cfg.fifosize; port->has_sysrq = IS_ENABLED(CONFIG_SERIAL_STM32_CONSOLE); - port->irq = ret; + port->irq = irq; port->rs485_config = stm32_usart_config_rs485; ret = stm32_usart_init_rs485(port, pdev); -- 2.17.1