lkml.org 
[lkml]   [2015]   [Dec]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH v2 4/4] drivers: tty: 68328serial.c: Move trailing statements to next line
Date
This patch moves trailing statements to the next line as checkpatch
suggests.

Signed-off-by: Frederik Völkel <frederik.voelkel@fau.de>
Signed-off-by: Lukas Braun <lukas.braun@fau.de>
---
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


\
 
 \ /
  Last update: 2015-12-16 16:41    [W:0.177 / U:0.672 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site