From: "Frederik Völkel" <frederik.voelkel@fau.de>
To: linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org
Cc: jslaby@suse.com, gregkh@linuxfoundation.org,
linux-kernel@i4.cs.fau.de,
"Frederik Völkel" <frederik.voelkel@fau.de>,
"Lukas Braun" <lukas.braun@fau.de>
Subject: [PATCH 9/9] drivers: tty: 68328serial.c: Move trailing statements to next line
Date: Fri, 11 Dec 2015 11:36:09 +0100 [thread overview]
Message-ID: <1449830170-15096-10-git-send-email-frederik.voelkel@fau.de> (raw)
In-Reply-To: <1449830170-15096-1-git-send-email-frederik.voelkel@fau.de>
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 7e2e494..d5bc7f1 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
next prev parent reply other threads:[~2015-12-11 10:36 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-11 10:36 [PATCH 0/9] Fix checkpatch errors Frederik Völkel
2015-12-11 10:36 ` [PATCH 1/9] drivers: tty: 68328serial.c: Add missing spaces(checkpatch) Frederik Völkel
2015-12-11 10:36 ` [PATCH 2/9] drivers: tty: 68328serial.c: remove unnecessary spaces(checkpatch) Frederik Völkel
2015-12-11 10:36 ` [PATCH 3/9] drivers: tty: 68328serial.c: Do not initialize statics to 0 Frederik Völkel
2015-12-11 10:36 ` [PATCH 4/9] drivers: tty: 68328serial.c: Fix "foo * bar" should be "foo *bar" Frederik Völkel
2015-12-11 10:36 ` [PATCH 5/9] drivers: tty: 68328serial.c: Remove parentheses after return Frederik Völkel
2015-12-11 10:36 ` [PATCH 6/9] drivers: tty: 68328serial.c: Use tabs for indentation Frederik Völkel
2015-12-13 7:08 ` Greg KH
2015-12-13 7:09 ` Greg KH
2015-12-11 10:36 ` [PATCH 7/9] drivers: tty: 68328serial.c: remove trailing whitespaces Frederik Völkel
2015-12-11 10:36 ` [PATCH 8/9] drivers: tty: 68328serial.c: Use use same indentation for switch/case Frederik Völkel
2015-12-11 10:36 ` Frederik Völkel [this message]
2015-12-13 7:06 ` [PATCH 0/9] Fix checkpatch errors Greg KH
2015-12-13 17:44 ` Frederik
2015-12-13 18:15 ` Nicolai Stange
2015-12-13 18:26 ` Frederik
2015-12-13 20:31 ` Ken Moffat
2015-12-16 15:16 ` [PATCH v2 0/4] " Frederik Völkel
2015-12-16 15:16 ` [PATCH v2 1/4] drivers: tty: 68328serial.c: Use tabs for indentation Frederik Völkel
2015-12-16 15:43 ` One Thousand Gnomes
2015-12-16 16:25 ` Peter Hurley
2015-12-16 15:16 ` [PATCH v2 2/4] drivers: tty: 68328serial.c: remove trailing whitespaces Frederik Völkel
2015-12-16 15:17 ` [PATCH v2 3/4] drivers: tty: 68328serial.c: Use use same indentation for switch/case Frederik Völkel
2015-12-16 15:17 ` [PATCH v2 4/4] drivers: tty: 68328serial.c: Move trailing statements to next line Frederik Völkel
2015-12-18 11:28 ` [PATCH] serial: Remove 68328 driver Frederik Völkel
2015-12-18 14:27 ` Geert Uytterhoeven
2016-01-04 5:03 ` Greg Ungerer
2016-01-04 10:30 ` One Thousand Gnomes
2016-01-04 11:10 ` Greg Ungerer
2016-01-11 17:57 ` Peter Hurley
2016-01-11 17:53 ` Peter Hurley
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1449830170-15096-10-git-send-email-frederik.voelkel@fau.de \
--to=frederik.voelkel@fau.de \
--cc=gregkh@linuxfoundation.org \
--cc=jslaby@suse.com \
--cc=linux-kernel@i4.cs.fau.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=lukas.braun@fau.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).