From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753367AbdLHVxs (ORCPT ); Fri, 8 Dec 2017 16:53:48 -0500 Received: from mout.web.de ([212.227.15.3]:54765 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752289AbdLHVxp (ORCPT ); Fri, 8 Dec 2017 16:53:45 -0500 Subject: [PATCH 3/3] serial: ioc4: Adjust three function calls together with a variable assignment From: SF Markus Elfring To: linux-serial@vger.kernel.org, Greg Kroah-Hartman , Jiri Slaby , Pat Gefre Cc: LKML , kernel-janitors@vger.kernel.org References: <514232dd-7e91-00f9-b95c-3e8f740090ca@users.sourceforge.net> Message-ID: <0256ab08-9330-26d6-19eb-e3c264c1ff1d@users.sourceforge.net> Date: Fri, 8 Dec 2017 22:53:26 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.0 MIME-Version: 1.0 In-Reply-To: <514232dd-7e91-00f9-b95c-3e8f740090ca@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:OqLR+d2htF+eoBiSiWihw+CSBfZTaB5L68CnHXgicTbXFF/4mMC HUvDBSfj+0LOKfBbE5NzrkakCY53jgUoYQkdNV5id6ntpTxy1z5TvbFOR6gnM+CQElBmMlg sEEFLzLInqvTymnEd1KQpmZIDLfPGcxHcDk6ViArsf6Vyk5Znm5I+38nUr+D0z9xnKVXwyX FntAJ7//x+XFfmQ8fmpOg== X-UI-Out-Filterresults: notjunk:1;V01:K0:4xGA2iXYhyw=:sm7zbsGb+l0s87HrgWC5IK UgFBWwztcBRmcJrjfEnS9+qV5bOL3fQmHnlIO5V05unxG34C0OKA+EfRLn4nCloATdN92pgZo Ud+8P9jcd5fO9iaG0hdceH8XMOko/3aI/oym4a/bwrnvV6ufbaOkEXHDi8mDKK++53T5MMgXT Q0v/lOjI/0XvwF47FQ/5T9GKy85mBZdWkDKRh9frjy2W6JZZKTwY1UtYFuEMJn/jCuMDPOrD7 XZwoE+KD6f+EERk9sA+heDgRTTtzfN9wkMQlDYJ2/No4Pm6BgH/VNJV0JKtboodLul0EEFVsb HUOiAbZuX1b7iCt7g1+Q1qlbefHbufpRwwzaNqWniiQryWeVzMbDH1P4a/yqG44alFqCcMDsP NDvhSHqOC3MnQHJuuEq0ys5XyszT6IG94wkjfjvcUbkU++BB5FvkbF4DlRbkzNyAaHMCIxDjn c3HnA6PJJohZt9oHCnGfUuAJHWDCCH90S8xTlqi9+ncGuR5Jyxji+/21UqMYa/39biO2KVWwY hBMEcGrsedPN0Uk6Peq4keo6NUXe5Kmh+HN8dmA9F3podcFYq2WXXRwJcO90R3jog5qNwilvs mRMlpYoAdDRuioMkk15aiwqH1FpPntMtYW9Zdwb8cBq67HjxaSj1K7Vv16Vfp/Ejj9mXJe7nn ZuSVlL8l+UYrippbz129vTfoTSEdLaN1tellc+jv99RdR0BXRZu1nucfTLwGGRjIG8xZHZt+0 BWnqOPuNgcFn9SOnc1VPayQ9ERI+gaGcQd0wFCuU8B0F1rZfMfsZQ+sVGEzAlbOsjqcIDjlfr 1EFwYmL0roFZqojWkTkF7uWNJvQbO5anP1S0OwJfM+C1ldMJCY= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Fri, 8 Dec 2017 22:40:31 +0100 The script "checkpatch.pl" pointed information out like the following. ERROR: do not use assignment in if condition Thus fix the affected source code places. Signed-off-by: Markus Elfring --- drivers/tty/serial/ioc4_serial.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/tty/serial/ioc4_serial.c b/drivers/tty/serial/ioc4_serial.c index 6981ad2ca1b7..ba95a4cb8130 100644 --- a/drivers/tty/serial/ioc4_serial.c +++ b/drivers/tty/serial/ioc4_serial.c @@ -1945,7 +1945,8 @@ static void handle_intr(void *arg, uint32_t sio_ir) * hasn't been delivered to the cpu yet anyway, even * though we see it as asserted when we read the sio_ir. */ - if ((sio_ir = PENDING(port)) & hooks->intr_rx_high) { + sio_ir = PENDING(port); + if (sio_ir & hooks->intr_rx_high) { if ((port->ip_flags & READ_ABORTED) == 0) { port->ip_ienb &= ~hooks->intr_rx_high; port->ip_flags |= INPUT_HIGH; @@ -2902,16 +2903,18 @@ static struct ioc4_submodule ioc4_serial_submodule = { */ static int __init ioc4_serial_init(void) { - int ret; - /* register with serial core */ - if ((ret = uart_register_driver(&ioc4_uart_rs232)) < 0) { + int ret = uart_register_driver(&ioc4_uart_rs232); + + if (ret < 0) { printk(KERN_WARNING "%s: Couldn't register rs232 IOC4 serial driver\n", __func__); goto out; } - if ((ret = uart_register_driver(&ioc4_uart_rs422)) < 0) { + + ret = uart_register_driver(&ioc4_uart_rs422); + if (ret < 0) { printk(KERN_WARNING "%s: Couldn't register rs422 IOC4 serial driver\n", __func__); -- 2.15.1