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 6/9] drivers: tty: 68328serial.c: Use tabs for indentation
Date: Fri, 11 Dec 2015 11:36:06 +0100 [thread overview]
Message-ID: <1449830170-15096-7-git-send-email-frederik.voelkel@fau.de> (raw)
In-Reply-To: <1449830170-15096-1-git-send-email-frederik.voelkel@fau.de>
The patch replaces the spaces used for indentation at some points with
tabs.
Signed-off-by: Frederik Völkel <frederik.voelkel@fau.de>
Signed-off-by: Lukas Braun <lukas.braun@fau.de>
---
drivers/tty/serial/68328serial.c | 82 ++++++++++++++++++++--------------------
1 file changed, 41 insertions(+), 41 deletions(-)
diff --git a/drivers/tty/serial/68328serial.c b/drivers/tty/serial/68328serial.c
index 0982c1a..22f52e0 100644
--- a/drivers/tty/serial/68328serial.c
+++ b/drivers/tty/serial/68328serial.c
@@ -228,17 +228,17 @@ static int rs_put_char(char ch)
unsigned long flags;
int loops = 0;
- local_irq_save(flags);
+ local_irq_save(flags);
while (!(UTX & UTX_TX_AVAIL) && (loops < 1000)) {
- loops++;
- udelay(5);
- }
+ loops++;
+ udelay(5);
+ }
UTX_TXDATA = ch;
- udelay(5);
- local_irq_restore(flags);
- return 1;
+ udelay(5);
+ local_irq_restore(flags);
+ return 1;
}
static void rs_start(struct tty_struct *tty)
@@ -268,7 +268,7 @@ static void receive_chars(struct m68k_serial *info, unsigned short rx)
/*
* This do { } while() loop will get ALL chars out of Rx FIFO
- */
+ */
#ifndef CONFIG_XCOPILOT_BUGS
do {
#endif
@@ -400,7 +400,7 @@ static int startup(struct m68k_serial *info, struct tty_struct *tty)
*/
#ifdef USE_INTS
uart->ustcnt = USTCNT_UEN | USTCNT_RXEN |
- USTCNT_RX_INTR_MASK | USTCNT_TX_INTR_MASK;
+ USTCNT_RX_INTR_MASK | USTCNT_TX_INTR_MASK;
#else
uart->ustcnt = USTCNT_UEN | USTCNT_RXEN | USTCNT_RX_INTR_MASK;
#endif
@@ -473,24 +473,24 @@ struct {
};
#else
hw_baud_table[18] = {
- {0, 0}, /* 0 */
- {0, 0}, /* 50 */
- {0, 0}, /* 75 */
- {0, 0}, /* 110 */
- {0, 0}, /* 134 */
- {0, 0}, /* 150 */
- {0, 0}, /* 200 */
- {0, 0}, /* 300 */
- {7, 0x26}, /* 600 */
- {6, 0x26}, /* 1200 */
- {0, 0}, /* 1800 */
- {5, 0x26}, /* 2400 */
- {4, 0x26}, /* 4800 */
- {3, 0x26}, /* 9600 */
- {2, 0x26}, /* 19200 */
- {1, 0x26}, /* 38400 */
- {0, 0x26}, /* 57600 */
- {1, 0x38}, /* 115200 */
+ {0, 0}, /* 0 */
+ {0, 0}, /* 50 */
+ {0, 0}, /* 75 */
+ {0, 0}, /* 110 */
+ {0, 0}, /* 134 */
+ {0, 0}, /* 150 */
+ {0, 0}, /* 200 */
+ {0, 0}, /* 300 */
+ {7, 0x26}, /* 600 */
+ {6, 0x26}, /* 1200 */
+ {0, 0}, /* 1800 */
+ {5, 0x26}, /* 2400 */
+ {4, 0x26}, /* 4800 */
+ {3, 0x26}, /* 9600 */
+ {2, 0x26}, /* 19200 */
+ {1, 0x26}, /* 38400 */
+ {0, 0x26}, /* 57600 */
+ {1, 0x38}, /* 115200 */
};
#endif
/* rate = 1036800 / ((65 - prescale) * (1<<divider)) */
@@ -516,9 +516,9 @@ static void change_speed(struct m68k_serial *info, struct tty_struct *tty)
uart->ustcnt = ustcnt & ~USTCNT_TXEN;
i = cflag & CBAUD;
- if (i & CBAUDEX) {
- i = (i & ~CBAUDEX) + B38400;
- }
+ if (i & CBAUDEX) {
+ i = (i & ~CBAUDEX) + B38400;
+ }
uart->ubaud = PUT_FIELD(UBAUD_DIVIDE, hw_baud_table[i].divisor) |
PUT_FIELD(UBAUD_PRESCALER, hw_baud_table[i].prescale);
@@ -907,16 +907,16 @@ static int get_lsr_info(struct m68k_serial *info, unsigned int *value)
static void send_break(struct m68k_serial *info, unsigned int duration)
{
m68328_uart *uart = &uart_addr[info->line];
- unsigned long flags;
- if (!info->port)
- return;
- local_irq_save(flags);
+ unsigned long flags;
+ if (!info->port)
+ return;
+ local_irq_save(flags);
#ifdef USE_INTS
uart->utx.w |= UTX_SEND_BREAK;
msleep_interruptible(duration);
uart->utx.w &= ~UTX_SEND_BREAK;
#endif
- local_irq_restore(flags);
+ local_irq_restore(flags);
}
static int rs_ioctl(struct tty_struct *tty,
@@ -1206,7 +1206,7 @@ rs68328_init(void)
rs_interrupt,
0,
"M68328_UART", info))
- panic("Unable to attach 68328 serial interrupt\n");
+ panic("Unable to attach 68328 serial interrupt\n");
tty_port_link_device(&info->tport, serial_driver, i);
}
@@ -1295,11 +1295,11 @@ void m68328_console_write (struct console *co, const char *str,
{
if (!m68328_console_initted)
m68328_set_baud();
- while (count--) {
- if (*str == '\n')
- rs_put_char('\r');
- rs_put_char(*str++);
- }
+ while (count--) {
+ if (*str == '\n')
+ rs_put_char('\r');
+ rs_put_char(*str++);
+ }
}
--
1.9.1
next prev parent reply other threads:[~2015-12-11 10:43 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 ` Frederik Völkel [this message]
2015-12-13 7:08 ` [PATCH 6/9] drivers: tty: 68328serial.c: Use tabs for indentation 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 ` [PATCH 9/9] drivers: tty: 68328serial.c: Move trailing statements to next line Frederik Völkel
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-7-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).