lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

serial_core: bring mostly into line with coding style

Browse Source 
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>
This commit is contained in:
Alan Cox
2008-02-08 04:18:53 -08:00
committed by Linus Torvalds
parent b4c502a709
commit a46c999424
1 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
drivers/serial/serial_core.c
View File

@@ -58,7 +58,8 @@ static struct lock_class_key port_lock_key;
#define uart_console(port) (0) #define uart_console(port) (0)
#endif #endif
static void uart_change_speed(struct uart_state *state, struct ktermios *old_termios); static void uart_change_speed(struct uart_state *state,
struct ktermios *old_termios);
static void uart_wait_until_sent(struct tty_struct *tty, int timeout); static void uart_wait_until_sent(struct tty_struct *tty, int timeout);
static void uart_change_pm(struct uart_state *state, int pm_state); static void uart_change_pm(struct uart_state *state, int pm_state);
@@ -129,8 +130,8 @@ uart_update_mctrl(struct uart_port *port, unsigned int set, unsigned int clear)
spin_unlock_irqrestore(&port->lock, flags); spin_unlock_irqrestore(&port->lock, flags);
} }
#define uart_set_mctrl(port,set) uart_update_mctrl(port,set,0) #define uart_set_mctrl(port, set) uart_update_mctrl(port, set, 0)
#define uart_clear_mctrl(port,clear) uart_update_mctrl(port,0,clear) #define uart_clear_mctrl(port, clear) uart_update_mctrl(port, 0, clear)
/* /*
* Startup the port. This will be called once per open. All calls * Startup the port. This will be called once per open. All calls
@@ -290,7 +291,7 @@ uart_update_timeout(struct uart_port *port, unsigned int cflag,
break; break;
default: default:
bits = 10; bits = 10;
break; // CS8 break; /* CS8 */
} }
if (cflag & CSTOPB) if (cflag & CSTOPB)
@@ -622,7 +623,7 @@ static int uart_get_info(struct uart_state *state,
tmp.close_delay = state->close_delay / 10; tmp.close_delay = state->close_delay / 10;
tmp.closing_wait = state->closing_wait == USF_CLOSING_WAIT_NONE ? tmp.closing_wait = state->closing_wait == USF_CLOSING_WAIT_NONE ?
ASYNC_CLOSING_WAIT_NONE : ASYNC_CLOSING_WAIT_NONE :
state->closing_wait / 10; state->closing_wait / 10;
tmp.custom_divisor = port->custom_divisor; tmp.custom_divisor = port->custom_divisor;
tmp.hub6 = port->hub6; tmp.hub6 = port->hub6;
tmp.io_type = port->iotype; tmp.io_type = port->iotype;
@@ -788,7 +789,8 @@ static int uart_set_info(struct uart_state *state,
* We failed anyway. * We failed anyway.
*/ */
retval = -EBUSY; retval = -EBUSY;
goto exit; // Added to return the correct error -Ram Gupta /* Added to return the correct error -Ram Gupta */
goto exit;
} }
} }
@@ -858,7 +860,7 @@ static int uart_get_lsr_info(struct uart_state *state,
((uart_circ_chars_pending(&state->info->xmit) > 0) && ((uart_circ_chars_pending(&state->info->xmit) > 0) &&
!state->info->tty->stopped && !state->info->tty->hw_stopped)) !state->info->tty->stopped && !state->info->tty->hw_stopped))
result &= ~TIOCSER_TEMT; result &= ~TIOCSER_TEMT;
return put_user(result, value); return put_user(result, value);
} }
@@ -996,8 +998,8 @@ uart_wait_modem_status(struct uart_state *state, unsigned long arg)
((arg & TIOCM_DSR) && (cnow.dsr != cprev.dsr)) || ((arg & TIOCM_DSR) && (cnow.dsr != cprev.dsr)) ||
((arg & TIOCM_CD) && (cnow.dcd != cprev.dcd)) || ((arg & TIOCM_CD) && (cnow.dcd != cprev.dcd)) ||
((arg & TIOCM_CTS) && (cnow.cts != cprev.cts))) { ((arg & TIOCM_CTS) && (cnow.cts != cprev.cts))) {
ret = 0; ret = 0;
break; break;
} }
schedule(); schedule();
@@ -1137,7 +1139,8 @@ uart_ioctl(struct tty_struct *tty, struct file *filp, unsigned int cmd,
return ret; return ret;
} }
static void uart_set_termios(struct tty_struct *tty, struct ktermios *old_termios) static void uart_set_termios(struct tty_struct *tty,
struct ktermios *old_termios)
{ {
struct uart_state *state = tty->driver_data; struct uart_state *state = tty->driver_data;
unsigned long flags; unsigned long flags;
@@ -1213,7 +1216,7 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
{ {
struct uart_state *state = tty->driver_data; struct uart_state *state = tty->driver_data;
struct uart_port *port; struct uart_port *port;
BUG_ON(!kernel_locked()); BUG_ON(!kernel_locked());
if (!state || !state->port) if (!state || !state->port)
@@ -1278,8 +1281,8 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
uart_shutdown(state); uart_shutdown(state);
uart_flush_buffer(tty); uart_flush_buffer(tty);
tty_ldisc_flush(tty); tty_ldisc_flush(tty);
tty->closing = 0; tty->closing = 0;
state->info->tty = NULL; state->info->tty = NULL;
@@ -1341,7 +1344,7 @@ static void uart_wait_until_sent(struct tty_struct *tty, int timeout)
expire = jiffies + timeout; expire = jiffies + timeout;
pr_debug("uart_wait_until_sent(%d), jiffies=%lu, expire=%lu...\n", pr_debug("uart_wait_until_sent(%d), jiffies=%lu, expire=%lu...\n",
port->line, jiffies, expire); port->line, jiffies, expire);
/* /*
* Check whether the transmitter is empty every 'char_time'. * Check whether the transmitter is empty every 'char_time'.
@@ -1460,10 +1463,9 @@ uart_block_til_ready(struct file *filp, struct uart_state *state)
* have set TTY_IO_ERROR for a non-existant port. * have set TTY_IO_ERROR for a non-existant port.
*/ */
if ((filp->f_flags & O_NONBLOCK) || if ((filp->f_flags & O_NONBLOCK) ||
(info->tty->termios->c_cflag & CLOCAL) || (info->tty->termios->c_cflag & CLOCAL) ||
(info->tty->flags & (1 << TTY_IO_ERROR))) { (info->tty->flags & (1 << TTY_IO_ERROR)))
break; break;
}
/* /*
* Set DTR to allow modem to know we're waiting. Do * Set DTR to allow modem to know we're waiting. Do
@@ -1674,7 +1676,7 @@ static int uart_line_info(char *buf, struct uart_driver *drv, int i)
port->line, uart_type(port), port->line, uart_type(port),
mmio ? "mmio:0x" : "port:", mmio ? "mmio:0x" : "port:",
mmio ? (unsigned long long)port->mapbase mmio ? (unsigned long long)port->mapbase
: (unsigned long long) port->iobase, : (unsigned long long) port->iobase,
port->irq); port->irq);
if (port->type == PORT_UNKNOWN) { if (port->type == PORT_UNKNOWN) {
@@ -1682,8 +1684,7 @@ static int uart_line_info(char *buf, struct uart_driver *drv, int i)
return ret + 1; return ret + 1;
} }
if(capable(CAP_SYS_ADMIN)) if (capable(CAP_SYS_ADMIN)) {
{
mutex_lock(&state->mutex); mutex_lock(&state->mutex);
pm_state = state->pm_state; pm_state = state->pm_state;
if (pm_state) if (pm_state)
@@ -1709,12 +1710,12 @@ static int uart_line_info(char *buf, struct uart_driver *drv, int i)
if (port->icount.overrun) if (port->icount.overrun)
ret += sprintf(buf + ret, " oe:%d", ret += sprintf(buf + ret, " oe:%d",
port->icount.overrun); port->icount.overrun);
#define INFOBIT(bit,str) \ #define INFOBIT(bit, str) \
if (port->mctrl & (bit)) \ if (port->mctrl & (bit)) \
strncat(stat_buf, (str), sizeof(stat_buf) - \ strncat(stat_buf, (str), sizeof(stat_buf) - \
strlen(stat_buf) - 2) strlen(stat_buf) - 2)
#define STATBIT(bit,str) \ #define STATBIT(bit, str) \
if (status & (bit)) \ if (status & (bit)) \
strncat(stat_buf, (str), sizeof(stat_buf) - \ strncat(stat_buf, (str), sizeof(stat_buf) - \
strlen(stat_buf) - 2) strlen(stat_buf) - 2)
@@ -1730,7 +1731,7 @@ static int uart_line_info(char *buf, struct uart_driver *drv, int i)
if (stat_buf[0]) if (stat_buf[0])
stat_buf[0] = ' '; stat_buf[0] = ' ';
strcat(stat_buf, "\n"); strcat(stat_buf, "\n");
ret += sprintf(buf + ret, stat_buf); ret += sprintf(buf + ret, stat_buf);
} else { } else {
strcat(buf, "\n"); strcat(buf, "\n");
@@ -1992,11 +1993,11 @@ int uart_suspend_port(struct uart_driver *drv, struct uart_port *port)
/* /*
* Wait for the transmitter to empty. * Wait for the transmitter to empty.
*/ */
for (tries = 3; !ops->tx_empty(port) && tries; tries--) { for (tries = 3; !ops->tx_empty(port) && tries; tries--)
msleep(10); msleep(10);
}
if (!tries) if (!tries)
printk(KERN_ERR "%s%s%s%d: Unable to drain transmitter\n", printk(KERN_ERR "%s%s%s%d: Unable to drain "
"transmitter\n",
port->dev ? port->dev->bus_id : "", port->dev ? port->dev->bus_id : "",
port->dev ? ": " : "", port->dev ? ": " : "",
drv->dev_name, port->line); drv->dev_name, port->line);