Skip to content

Commit

Permalink
serial8250: coding style
Browse files Browse the repository at this point in the history
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Alan Cox authored and Linus Torvalds committed Feb 8, 2008
1 parent 5756ee9 commit 6f803cd
Showing 1 changed file with 10 additions and 9 deletions.
19 changes: 10 additions & 9 deletions drivers/serial/8250.c
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ static inline int map_8250_out_reg(struct uart_8250_port *up, int offset)
return au_io_out_map[offset];
}

#elif defined (CONFIG_SERIAL_8250_RM9K)
#elif defined(CONFIG_SERIAL_8250_RM9K)

static const u8
regmap_in[8] = {
Expand Down Expand Up @@ -475,7 +475,7 @@ static inline void _serial_dl_write(struct uart_8250_port *up, int value)
serial_outp(up, UART_DLM, value >> 8 & 0xff);
}

#if defined (CONFIG_SERIAL_8250_AU1X00)
#if defined(CONFIG_SERIAL_8250_AU1X00)
/* Au1x00 haven't got a standard divisor latch */
static int serial_dl_read(struct uart_8250_port *up)
{
Expand All @@ -492,7 +492,7 @@ static void serial_dl_write(struct uart_8250_port *up, int value)
else
_serial_dl_write(up, value);
}
#elif defined (CONFIG_SERIAL_8250_RM9K)
#elif defined(CONFIG_SERIAL_8250_RM9K)
static int serial_dl_read(struct uart_8250_port *up)
{
return (up->port.iotype == UPIO_RM9000) ?
Expand Down Expand Up @@ -1185,8 +1185,8 @@ static void autoconfig_irq(struct uart_8250_port *up)

irqs = probe_irq_on();
serial_outp(up, UART_MCR, 0);
udelay (10);
if (up->port.flags & UPF_FOURPORT) {
udelay(10);
if (up->port.flags & UPF_FOURPORT) {
serial_outp(up, UART_MCR,
UART_MCR_DTR | UART_MCR_RTS);
} else {
Expand All @@ -1199,7 +1199,7 @@ static void autoconfig_irq(struct uart_8250_port *up)
(void)serial_inp(up, UART_IIR);
(void)serial_inp(up, UART_MSR);
serial_outp(up, UART_TX, 0xFF);
udelay (20);
udelay(20);
irq = probe_irq_off(irqs);

serial_outp(up, UART_MCR, save_mcr);
Expand Down Expand Up @@ -1343,7 +1343,7 @@ receive_chars(struct uart_8250_port *up, unsigned int *status)

uart_insert_char(&up->port, lsr, UART_LSR_OE, ch, flag);

ignore_char:
ignore_char:
lsr = serial_inp(up, UART_LSR);
} while ((lsr & UART_LSR_DR) && (max_count-- > 0));
spin_unlock(&up->port.lock);
Expand Down Expand Up @@ -1633,7 +1633,8 @@ static void serial8250_backup_timeout(unsigned long data)
serial_out(up, UART_IER, ier);

/* Standard timer interval plus 0.2s to keep the port running */
mod_timer(&up->timer, jiffies + poll_timeout(up->port.timeout) + HZ/5);
mod_timer(&up->timer,
jiffies + poll_timeout(up->port.timeout) + HZ / 5);
}

static unsigned int serial8250_tx_empty(struct uart_port *port)
Expand Down Expand Up @@ -1844,7 +1845,7 @@ static int serial8250_startup(struct uart_port *port)
up->timer.function = serial8250_backup_timeout;
up->timer.data = (unsigned long)up;
mod_timer(&up->timer, jiffies +
poll_timeout(up->port.timeout) + HZ/5);
poll_timeout(up->port.timeout) + HZ / 5);
}
}

Expand Down

0 comments on commit 6f803cd

Please sign in to comment.