hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sdio_uart: coding style fixes 

Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
Thadeu Lima de Souza Cascardo 2009-10-15 16:44:00 -03:00 committed by Jiri Kosina
parent 94e2bd6888
commit 1e04b7ae70
1 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
drivers/mmc/card/sdio_uart.c
View File

@ -231,7 +231,8 @@ static unsigned int sdio_uart_get_mctrl(struct sdio_uart_port *port)
return ret; return ret;
} }
static void sdio_uart_write_mctrl(struct sdio_uart_port *port, unsigned int mctrl) static void sdio_uart_write_mctrl(struct sdio_uart_port *port,
unsigned int mctrl)
{ {
unsigned char mcr = 0; unsigned char mcr = 0;
@ -387,7 +388,8 @@ static void sdio_uart_stop_rx(struct sdio_uart_port *port)
sdio_out(port, UART_IER, port->ier); sdio_out(port, UART_IER, port->ier);
} }
static void sdio_uart_receive_chars(struct sdio_uart_port *port, unsigned int *status) static void sdio_uart_receive_chars(struct sdio_uart_port *port,
unsigned int *status)
{ {
struct tty_struct *tty = port->tty; struct tty_struct *tty = port->tty;
unsigned int ch, flag; unsigned int ch, flag;
@ -399,7 +401,7 @@ static void sdio_uart_receive_chars(struct sdio_uart_port *port, unsigned int *s
port->icount.rx++; port->icount.rx++;
if (unlikely(*status & (UART_LSR_BI | UART_LSR_PE | if (unlikely(*status & (UART_LSR_BI | UART_LSR_PE |
UART_LSR_FE | UART_LSR_OE))) { UART_LSR_FE | UART_LSR_OE))) {
/* /*
* For statistics only * For statistics only
*/ */
@ -417,9 +419,9 @@ static void sdio_uart_receive_chars(struct sdio_uart_port *port, unsigned int *s
* Mask off conditions which should be ignored. * Mask off conditions which should be ignored.
*/ */
*status &= port->read_status_mask; *status &= port->read_status_mask;
if (*status & UART_LSR_BI) { if (*status & UART_LSR_BI)
flag = TTY_BREAK; flag = TTY_BREAK;
} else if (*status & UART_LSR_PE) else if (*status & UART_LSR_PE)
flag = TTY_PARITY; flag = TTY_PARITY;
else if (*status & UART_LSR_FE) else if (*status & UART_LSR_FE)
flag = TTY_FRAME; flag = TTY_FRAME;
@ -574,7 +576,7 @@ static int sdio_uart_startup(struct sdio_uart_port *port)
*/ */
sdio_out(port, UART_FCR, UART_FCR_ENABLE_FIFO); sdio_out(port, UART_FCR, UART_FCR_ENABLE_FIFO);
sdio_out(port, UART_FCR, UART_FCR_ENABLE_FIFO | sdio_out(port, UART_FCR, UART_FCR_ENABLE_FIFO |
UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT); UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT);
sdio_out(port, UART_FCR, 0); sdio_out(port, UART_FCR, 0);
/* /*
@ -635,7 +637,7 @@ static void sdio_uart_shutdown(struct sdio_uart_port *port)
if (port->tty->termios->c_cflag & HUPCL) if (port->tty->termios->c_cflag & HUPCL)
sdio_uart_clear_mctrl(port, TIOCM_DTR | TIOCM_RTS); sdio_uart_clear_mctrl(port, TIOCM_DTR | TIOCM_RTS);
/* Disable interrupts from this port */ /* Disable interrupts from this port */
sdio_release_irq(port->func); sdio_release_irq(port->func);
port->ier = 0; port->ier = 0;
sdio_out(port, UART_IER, 0); sdio_out(port, UART_IER, 0);
@ -659,7 +661,7 @@ skip:
free_page((unsigned long)port->xmit.buf); free_page((unsigned long)port->xmit.buf);
} }
static int sdio_uart_open (struct tty_struct *tty, struct file * filp) static int sdio_uart_open(struct tty_struct *tty, struct file *filp)
{ {
struct sdio_uart_port *port; struct sdio_uart_port *port;
int ret; int ret;
@ -846,7 +848,7 @@ static void sdio_uart_set_termios(struct tty_struct *tty, struct ktermios *old_t
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;
#define RELEVANT_IFLAG(iflag) ((iflag) & (IGNBRK|BRKINT|IGNPAR|PARMRK|INPCK)) #define RELEVANT_IFLAG(iflag) ((iflag) & (IGNBRK|BRKINT|IGNPAR|PARMRK|INPCK))
if ((cflag ^ old_termios->c_cflag) == 0 && if ((cflag ^ old_termios->c_cflag) == 0 &&
RELEVANT_IFLAG(tty->termios->c_iflag ^ old_termios->c_iflag) == 0) RELEVANT_IFLAG(tty->termios->c_iflag ^ old_termios->c_iflag) == 0)
@ -925,7 +927,7 @@ static int sdio_uart_tiocmset(struct tty_struct *tty, struct file *file,
struct sdio_uart_port *port = tty->driver_data; struct sdio_uart_port *port = tty->driver_data;
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);
@ -946,31 +948,31 @@ static int sdio_uart_proc_show(struct seq_file *m, void *v)
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)
seq_printf(m, " fe:%d", seq_printf(m, " fe:%d",
port->icount.frame); port->icount.frame);
if (port->icount.parity) if (port->icount.parity)
seq_printf(m, " pe:%d", seq_printf(m, " pe:%d",
port->icount.parity); port->icount.parity);
if (port->icount.brk) if (port->icount.brk)
seq_printf(m, " brk:%d", seq_printf(m, " brk:%d",
port->icount.brk); port->icount.brk);
if (port->icount.overrun) if (port->icount.overrun)
seq_printf(m, " oe:%d", seq_printf(m, " oe:%d",
port->icount.overrun); port->icount.overrun);
if (port->icount.cts) if (port->icount.cts)
seq_printf(m, " cts:%d", seq_printf(m, " cts:%d",
port->icount.cts); port->icount.cts);
if (port->icount.dsr) if (port->icount.dsr)
seq_printf(m, " dsr:%d", seq_printf(m, " dsr:%d",
port->icount.dsr); port->icount.dsr);
if (port->icount.rng) if (port->icount.rng)
seq_printf(m, " rng:%d", seq_printf(m, " rng:%d",
port->icount.rng); port->icount.rng);
if (port->icount.dcd) if (port->icount.dcd)
seq_printf(m, " dcd:%d", seq_printf(m, " dcd:%d",
port->icount.dcd); port->icount.dcd);
} }
sdio_uart_port_put(port); sdio_uart_port_put(port);
seq_putc(m, '\n'); seq_putc(m, '\n');