Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754735AbbLPP0M (ORCPT ); Wed, 16 Dec 2015 10:26:12 -0500 Received: from mx-rz-1.rrze.uni-erlangen.de ([131.188.11.20]:54092 "EHLO mx-rz-1.rrze.uni-erlangen.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754704AbbLPPRY (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 1/4] drivers: tty: 68328serial.c: Use tabs for indentation Date: Wed, 16 Dec 2015 16:16:58 +0100 Message-Id: <1450279021-17154-2-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: 4777 Lines: 168 The patch replaces the spaces used for indentation at some points with tabs. Signed-off-by: Frederik Völkel Signed-off-by: Lukas Braun --- 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..183f6d9 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<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 -- 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/