Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965731AbbLPP0O (ORCPT ); Wed, 16 Dec 2015 10:26:14 -0500 Received: from mx-rz-1.rrze.uni-erlangen.de ([131.188.11.20]:49265 "EHLO mx-rz-1.rrze.uni-erlangen.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752692AbbLPPRY (ORCPT ); Wed, 16 Dec 2015 10:17:24 -0500 X-RRZE-Submit-IP: 131.188.42.193 From: =?UTF-8?q?Frederik=20V=C3=B6lkel?= To: gregkh@linuxfoundation.org, jslaby@suse.com Cc: linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, lukas.braun@fau.de, linux-kernel@i4.cs.fau.de, =?UTF-8?q?Frederik=20V=C3=B6lkel?= Subject: [PATCH v2 4/4] drivers: tty: 68328serial.c: Move trailing statements to next line Date: Wed, 16 Dec 2015 16:17:01 +0100 Message-Id: <1450279021-17154-5-git-send-email-frederik.voelkel@fau.de> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1450279021-17154-1-git-send-email-frederik.voelkel@fau.de> References: <1449830170-15096-1-git-send-email-frederik.voelkel@fau.de> <1450279021-17154-1-git-send-email-frederik.voelkel@fau.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1977 Lines: 64 This patch moves trailing statements to the next line as checkpatch suggests. Signed-off-by: Frederik Völkel Signed-off-by: Lukas Braun --- drivers/tty/serial/68328serial.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/drivers/tty/serial/68328serial.c b/drivers/tty/serial/68328serial.c index c0bd3a6..f5224aa 100644 --- a/drivers/tty/serial/68328serial.c +++ b/drivers/tty/serial/68328serial.c @@ -195,7 +195,8 @@ static inline int get_baud(struct m68k_serial *ss) { unsigned long result = 115200; unsigned short int baud = uart_addr[ss->line].ubaud; - if (GET_FIELD(baud, UBAUD_PRESCALER) == 0x38) result = 38400; + if (GET_FIELD(baud, UBAUD_PRESCALER) == 0x38) + result = 38400; result >>= GET_FIELD(baud, UBAUD_DIVIDE); return result; @@ -560,8 +561,10 @@ static void rs_fair_output(void) struct m68k_serial *info = &m68k_soft[0]; char c; - if (info == NULL) return; - if (info->xmit_buf == NULL) return; + if (info == NULL) + return; + if (info->xmit_buf == NULL) + return; local_irq_save(flags); left = info->xmit_cnt; @@ -653,7 +656,8 @@ static void rs_flush_chars(struct tty_struct *tty) } #ifndef USE_INTS - while (!(uart->utx.w & UTX_TX_AVAIL)) udelay(5); + while (!(uart->utx.w & UTX_TX_AVAIL)) + udelay(5); } #endif local_irq_restore(flags); @@ -707,7 +711,8 @@ static int rs_write(struct tty_struct *tty, #ifdef USE_INTS uart->ustcnt |= USTCNT_TX_INTR_MASK; #else - while (!(uart->utx.w & UTX_TX_AVAIL)) udelay(5); + while (!(uart->utx.w & UTX_TX_AVAIL)) + udelay(5); #endif if (uart->utx.w & UTX_TX_AVAIL) { uart->utx.b.txdata = info->xmit_buf[info->xmit_tail++]; -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/