adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 19:56:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

tty: sdio_uart: Style fixes

Browse source 
Running the current code through checkpatch shows a few bits of noise
mostly but not entirely from before the changes.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Alan Cox 2009-11-30 13:16:25 +00:00 committed by Greg Kroah-Hartman
parent 6238e712af
commit c271cf37ba
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
drivers/mmc/card/sdio_uart.c
View file

@ -465,7 +465,8 @@ static void sdio_uart_transmit_chars(struct sdio_uart_port *port)
tty = tty_port_tty_get(&port->port); tty = tty_port_tty_get(&port->port);
if (tty == NULL || circ_empty(xmit) || tty->stopped || tty->hw_stopped) { if (tty == NULL || circ_empty(xmit) ||
tty->stopped || tty->hw_stopped) {
sdio_uart_stop_tx(port); sdio_uart_stop_tx(port);
tty_kref_put(tty); tty_kref_put(tty);
return; return;
@ -645,7 +646,7 @@ static int sdio_uart_activate(struct tty_port *tport, struct tty_struct *tty)
*/ */
sdio_out(port, UART_LCR, UART_LCR_WLEN8); sdio_out(port, UART_LCR, UART_LCR_WLEN8);
port->ier = UART_IER_RLSI | UART_IER_RDI | UART_IER_RTOIE | UART_IER_UUE; port->ier = UART_IER_RLSI|UART_IER_RDI|UART_IER_RTOIE|UART_IER_UUE;
port->mctrl = TIOCM_OUT2; port->mctrl = TIOCM_OUT2;
sdio_uart_change_speed(port, tty->termios, NULL); sdio_uart_change_speed(port, tty->termios, NULL);
@ -674,7 +675,6 @@ err1:
return ret; return ret;
} }
/** /**
* sdio_uart_shutdown - stop hardware * sdio_uart_shutdown - stop hardware
* @tport: tty port to shut down * @tport: tty port to shut down
@ -745,7 +745,6 @@ static int sdio_uart_install(struct tty_driver *driver, struct tty_struct *tty)
} else } else
sdio_uart_port_put(port); sdio_uart_port_put(port);
return ret; return ret;
} }
/** /**
@ -785,7 +784,7 @@ static void sdio_uart_hangup(struct tty_struct *tty)
tty_port_hangup(&port->port); tty_port_hangup(&port->port);
} }
static int sdio_uart_write(struct tty_struct * tty, const unsigned char *buf, static int sdio_uart_write(struct tty_struct *tty, const unsigned char *buf,
int count) int count)
{ {
struct sdio_uart_port *port = tty->driver_data; struct sdio_uart_port *port = tty->driver_data;
@ -810,7 +809,7 @@ static int sdio_uart_write(struct tty_struct * tty, const unsigned char *buf,
} }
spin_unlock(&port->write_lock); spin_unlock(&port->write_lock);
if ( !(port->ier & UART_IER_THRI)) { if (!(port->ier & UART_IER_THRI)) {
int err = sdio_uart_claim_func(port); int err = sdio_uart_claim_func(port);
if (!err) { if (!err) {
sdio_uart_start_tx(port); sdio_uart_start_tx(port);
@ -897,7 +896,8 @@ static void sdio_uart_unthrottle(struct tty_struct *tty)
sdio_uart_release_func(port); sdio_uart_release_func(port);
} }
static void sdio_uart_set_termios(struct tty_struct *tty, struct ktermios *old_termios) static void sdio_uart_set_termios(struct tty_struct *tty,
struct ktermios *old_termios)
{ {
struct sdio_uart_port *port = tty->driver_data; struct sdio_uart_port *port = tty->driver_data;
unsigned int cflag = tty->termios->c_cflag; unsigned int cflag = tty->termios->c_cflag;
@ -976,7 +976,7 @@ static int sdio_uart_tiocmset(struct tty_struct *tty, struct file *file,
int result; int result;
result = sdio_uart_claim_func(port); result = sdio_uart_claim_func(port);
if(!result) { if (!result) {
sdio_uart_update_mctrl(port, set, clear); sdio_uart_update_mctrl(port, set, clear);
sdio_uart_release_func(port); sdio_uart_release_func(port);
} }
@ -994,7 +994,7 @@ static int sdio_uart_proc_show(struct seq_file *m, void *v)
struct sdio_uart_port *port = sdio_uart_port_get(i); struct sdio_uart_port *port = sdio_uart_port_get(i);
if (port) { if (port) {
seq_printf(m, "%d: uart:SDIO", i); seq_printf(m, "%d: uart:SDIO", i);
if(capable(CAP_SYS_ADMIN)) { if (capable(CAP_SYS_ADMIN)) {
seq_printf(m, " tx:%d rx:%d", seq_printf(m, " tx:%d rx:%d",
port->icount.tx, port->icount.rx); port->icount.tx, port->icount.rx);
if (port->icount.frame) if (port->icount.frame)
@ -1100,7 +1100,7 @@ static int sdio_uart_probe(struct sdio_func *func,
} }
if (!tpl) { if (!tpl) {
printk(KERN_WARNING printk(KERN_WARNING
"%s: can't find tuple 0x91 subtuple 0 (SUBTPL_SIOREG) for GPS class\n", "%s: can't find tuple 0x91 subtuple 0 (SUBTPL_SIOREG) for GPS class\n",
sdio_func_id(func)); sdio_func_id(func));
kfree(port); kfree(port);
return -EINVAL; return -EINVAL;
@ -1133,7 +1133,8 @@ static int sdio_uart_probe(struct sdio_func *func,
kfree(port); kfree(port);
} else { } else {
struct device *dev; struct device *dev;
dev = tty_register_device(sdio_uart_tty_driver, port->index, &func->dev); dev = tty_register_device(sdio_uart_tty_driver,
port->index, &func->dev);
if (IS_ERR(dev)) { if (IS_ERR(dev)) {
sdio_uart_port_remove(port); sdio_uart_port_remove(port);
ret = PTR_ERR(dev); ret = PTR_ERR(dev);