Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751569AbbLMHJb (ORCPT ); Sun, 13 Dec 2015 02:09:31 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:33758 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750919AbbLMHJ2 (ORCPT ); Sun, 13 Dec 2015 02:09:28 -0500 Date: Sat, 12 Dec 2015 23:09:28 -0800 From: Greg KH To: Frederik =?iso-8859-1?Q?V=F6lkel?= Cc: linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org, jslaby@suse.com, linux-kernel@i4.cs.fau.de, Lukas Braun Subject: Re: [PATCH 6/9] drivers: tty: 68328serial.c: Use tabs for indentation Message-ID: <20151213070928.GA16722@kroah.com> References: <1449830170-15096-1-git-send-email-frederik.voelkel@fau.de> <1449830170-15096-7-git-send-email-frederik.voelkel@fau.de> <20151213070800.GA3832@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20151213070800.GA3832@kroah.com> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 5738 Lines: 176 On Sat, Dec 12, 2015 at 11:08:00PM -0800, Greg KH wrote: > On Fri, Dec 11, 2015 at 11:36:06AM +0100, Frederik V?lkel wrote: > > 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..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< > @@ -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++); > > This line should also be indented one more tab, right? > > > + } > > Please fix up and resend. And resend the rest of the patches in this series, I stopped applying them here, but applied the previous ones. thanks, greg k-h -- 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/