From patchwork Fri Mar 3 14:17:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Genoud X-Patchwork-Id: 9602911 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D47C26016C for ; Fri, 3 Mar 2017 14:18:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C66AC285D1 for ; Fri, 3 Mar 2017 14:18:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BB6622862B; Fri, 3 Mar 2017 14:18:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 60E7A285D1 for ; Fri, 3 Mar 2017 14:18:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: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:In-Reply-To: References:List-Owner; bh=jNaMegJ9FCI4N8GPNGOBgiuOvlKbNlobgwAbMc9GWBw=; b=VDM 5Lt/fzU1S3j3PEWFDdG+KqsmI8/S/TUGKXvAC4mzTmAnK/G9T6zog6zYqeXaHzO5YoHMkyEY3f3cN Q0BZr8FBpkAWB9Ho5h3cx0xZoCveACawudzvOkeK4y6dyOMUgf/4R9FVjOCGywBGNbgxAV8lHEm0J BfKBK47EPfsYY2JZKPIXx0vbKz/K7tol1iJufw09L0VgSLyNoAtPCNgdIrqqnnaqEt+8ner/sNCkS bGkDKeNGper3ulZN3ZKGF9FEUnKiIs3TkWb041bXgG/ZNmUzXqkmZ5pv/dMM3onFgoTecBWuaJCfe mYKwah1/OJE+apESV2nY538e7F7lR6g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cjo1y-0007zP-4v; Fri, 03 Mar 2017 14:18:02 +0000 Received: from mail-wr0-x242.google.com ([2a00:1450:400c:c0c::242]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cjo1Z-0007we-9Z for linux-arm-kernel@lists.infradead.org; Fri, 03 Mar 2017 14:17:39 +0000 Received: by mail-wr0-x242.google.com with SMTP id u108so9520208wrb.2 for ; Fri, 03 Mar 2017 06:17:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=ZUbHpDkGod+DJi4RtBbvYfMAVGiMox8QERWXNRaVy5w=; b=Oi0fDCiJCwHLknTEu01Q3KeXQTmjEK9boMG3jpdsOMoG8ez+vNcQ8BWRjFOIpFUL7N zZS1wVW0BH/FyTcnbozteda9KmRio1rnMSKJuwoX0JNAv+N9twYkKKcXSzNGgbr2UXpt oJGuu/6iKxMhsiC2cxLM0XEuti/uwF57Vy5VjWrs3bH6MnnxVC4j7XCZkVhZYEekBxWp Y6Q2+JPobwBOaA6OlUmzCu2ueJyQrsMgSjBqcdxyKjFxH2W7lAl62lkkMd8kfOyWYbeT vag8q64Q0jUgELt3thQ/XYI+4XcdC/nyggd/B6iBilD6YLtWCGL2IaOqoEogXnstCmJW maCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=ZUbHpDkGod+DJi4RtBbvYfMAVGiMox8QERWXNRaVy5w=; b=qQDvG1BjxhOxnUECrMEq+bwqKBboNDCamdBEBBDNsOBZAq2Tivstlq6NbRxytqXy3R geB11OWnVmsUwugs14SQNSKSSPehn99XO2P9Euym4Zt1U27E4KQzeroDq8FwwQhQS6uA Ecq7M0BnaFurpTaj8xSprV6Xft3WxIX8+IZLJ8eDsh/ZJrodORzjL/fSgLb5jYXkm8ZA LtU8JTApisVjLcub8Ntus7BOEZjC8A3n9VK9s2sI1zKJLQjLNru47j/Aa7KDisiWiR9E y6r+Vn/e6KPXmP14XYNgZhkhx2iKdnpXzG6vT4HFOjr/C76sAQmg3d02sSGsupkvoI9f TKjg== X-Gm-Message-State: AMke39kJPCyo1A083Pw0NE1kU9LcIuWfG7gk/KSfwFds4KAJYIWnzQJ5Mn9bQjQEcY45ZA== X-Received: by 10.223.173.76 with SMTP id p70mr2721523wrc.168.1488550635665; Fri, 03 Mar 2017 06:17:15 -0800 (PST) Received: from localhost ([46.227.18.67]) by smtp.gmail.com with ESMTPSA id s18sm3231078wmb.18.2017.03.03.06.17.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Mar 2017 06:17:15 -0800 (PST) From: Richard Genoud To: Greg Kroah-Hartman Subject: [PATCH 2/4] tty/serial: atmel: remove uneeded IS_ERR_OR_NULL calls Date: Fri, 3 Mar 2017 15:17:02 +0100 Message-Id: <20170303141702.15331-1-richard.genoud@gmail.com> X-Mailer: git-send-email 2.11.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170303_061737_498360_A8E699CC X-CRM114-Status: UNSURE ( 9.35 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Boris Brezillon , Richard Genoud , linux-kernel@vger.kernel.org, Nicolas Ferre , linux-serial@vger.kernel.org, =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Since commit 1d267ea6539f ("serial: mctrl-gpio: simplify init routine"), the mctrl_gpio_to_gpiod() function can't return an error anymore. So, just testing for a NULL pointer is ok. Signed-off-by: Richard Genoud --- drivers/tty/serial/atmel_serial.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c index ad6c2bdea481..e0f1955b3c7e 100644 --- a/drivers/tty/serial/atmel_serial.c +++ b/drivers/tty/serial/atmel_serial.c @@ -315,32 +315,28 @@ static unsigned int atmel_get_lines_status(struct uart_port *port) mctrl_gpio_get(atmel_port->gpios, &ret); - if (!IS_ERR_OR_NULL(mctrl_gpio_to_gpiod(atmel_port->gpios, - UART_GPIO_CTS))) { + if (mctrl_gpio_to_gpiod(atmel_port->gpios, UART_GPIO_CTS)) { if (ret & TIOCM_CTS) status &= ~ATMEL_US_CTS; else status |= ATMEL_US_CTS; } - if (!IS_ERR_OR_NULL(mctrl_gpio_to_gpiod(atmel_port->gpios, - UART_GPIO_DSR))) { + if (mctrl_gpio_to_gpiod(atmel_port->gpios, UART_GPIO_DSR)) { if (ret & TIOCM_DSR) status &= ~ATMEL_US_DSR; else status |= ATMEL_US_DSR; } - if (!IS_ERR_OR_NULL(mctrl_gpio_to_gpiod(atmel_port->gpios, - UART_GPIO_RI))) { + if (mctrl_gpio_to_gpiod(atmel_port->gpios, UART_GPIO_RI)) { if (ret & TIOCM_RI) status &= ~ATMEL_US_RI; else status |= ATMEL_US_RI; } - if (!IS_ERR_OR_NULL(mctrl_gpio_to_gpiod(atmel_port->gpios, - UART_GPIO_DCD))) { + if (mctrl_gpio_to_gpiod(atmel_port->gpios, UART_GPIO_DCD)) { if (ret & TIOCM_CD) status &= ~ATMEL_US_DCD; else