There were lot of styleguide errors raised by checkpatch.pl against
drivers/tty/* which I have fixed. There is zero code change apart from
changes related to styleguide. checkpatch.pl returns 0 error for
style guide now.
---
drivers/tty/amiserial.c | 285 ++++++++++++++++++-------------------
drivers/tty/ehv_bytechan.c | 5 +-
drivers/tty/goldfish.c | 2 +
3 files changed, 142 insertions(+), 150 deletions(-)
diff --git a/drivers/tty/amiserial.c b/drivers/tty/amiserial.c
index 1e60dbef6..15917254e 100644
--- a/drivers/tty/amiserial.c
+++ b/drivers/tty/amiserial.c
@@ -12,13 +12,13 @@
* (non hardware specific) changes to serial.c.
*
* The port is registered with the tty driver as minor device 64, and
- * therefore other ports should should only use 65 upwards.
+ * therefore other ports should only use 65 upwards.
*
* Richard Lucock 28/12/99
*
* Copyright (C) 1991, 1992 Linus Torvalds
- * Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997,
- * 1998, 1999 Theodore Ts'o
+ * Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997,
+ * 1998, 1999 Theodore Ts'o
*
*/
@@ -78,8 +78,8 @@ struct serial_state {
int ignore_status_mask;
int timeout;
int quot;
- int IER; /* Interrupt Enable Register */
- int MCR; /* Modem control register */
+ int IER; /* Interrupt Enable Register */
+ int MCR; /* Modem control register */
int x_char; /* xon/xoff character */
};
@@ -116,9 +116,9 @@ static struct serial_state serial_state;
#define SER_CTS (1<<4)
#define SER_DSR (1<<3)
-static __inline__ void rtsdtr_ctrl(int bits)
+static inline void rtsdtr_ctrl(int bits)
{
- ciab.pra = ((bits & (SER_RTS | SER_DTR)) ^ (SER_RTS | SER_DTR)) |
(ciab.pra & ~(SER_RTS | SER_DTR));
+ ciab.pra = ((bits & (SER_RTS | SER_DTR)) ^ (SER_RTS | SER_DTR)) |
(ciab.pra & ~(SER_RTS | SER_DTR));
}
/*
@@ -175,7 +175,7 @@ static void rs_start(struct tty_struct *tty)
static void receive_chars(struct serial_state *info)
{
- int status;
+ int status;
int serdatr;
unsigned char ch, flag;
struct async_icount *icount;
@@ -189,10 +189,10 @@ static void receive_chars(struct serial_state *info)
amiga_custom.intreq = IF_RBF;
mb();
- if((serdatr & 0x1ff) == 0)
- status |= UART_LSR_BI;
- if(serdatr & SDR_OVRUN)
- status |= UART_LSR_OE;
+ if ((serdatr & 0x1ff) == 0)
+ status |= UART_LSR_BI;
+ if (serdatr & SDR_OVRUN)
+ status |= UART_LSR_OE;
ch = serdatr & 0xff;
icount->rx++;
@@ -213,45 +213,44 @@ static void receive_chars(struct serial_state *info)
/*
* For statistics only
*/
- if (status & UART_LSR_BI) {
- status &= ~(UART_LSR_FE | UART_LSR_PE);
- icount->brk++;
- } else if (status & UART_LSR_PE)
- icount->parity++;
- else if (status & UART_LSR_FE)
- icount->frame++;
- if (status & UART_LSR_OE)
- icount->overrun++;
+ if (status & UART_LSR_BI) {
+ status &= ~(UART_LSR_FE | UART_LSR_PE);
+ icount->brk++;
+ } else if (status & UART_LSR_PE)
+ icount->parity++;
+ else if (status & UART_LSR_FE)
+ icount->frame++;
+ if (status & UART_LSR_OE)
+ icount->overrun++;
/*
* Now check to see if character should be
* ignored, and mask off conditions which
* should be ignored.
*/
- if (status & info->ignore_status_mask)
- goto out;
+ if (status & info->ignore_status_mask)
+ goto out;
- status &= info->read_status_mask;
-
- if (status & (UART_LSR_BI)) {
+ status &= info->read_status_mask;
+ if (status & (UART_LSR_BI)) {
#ifdef SERIAL_DEBUG_INTR
- printk("handling break....");
+ printk("handling break....");
#endif
- flag = TTY_BREAK;
- if (info->tport.flags & ASYNC_SAK)
- do_SAK(info->tport.tty);
- } else if (status & UART_LSR_PE)
- flag = TTY_PARITY;
- else if (status & UART_LSR_FE)
- flag = TTY_FRAME;
- if (status & UART_LSR_OE) {
- /*
- * Overrun is special, since it's
- * reported immediately, and doesn't
- * affect the current character
- */
- oe = 1;
- }
+ flag = TTY_BREAK;
+ if (info->tport.flags & ASYNC_SAK)
+ do_SAK(info->tport.tty);
+ } else if (status & UART_LSR_PE)
+ flag = TTY_PARITY;
+ else if (status & UART_LSR_FE)
+ flag = TTY_FRAME;
+ if (status & UART_LSR_OE) {
+ /*
+ * Overrun is special, since it's
+ * reported immediately, and doesn't
+ * affect the current character
+ */
+ oe = 1;
+ }
}
tty_insert_flip_char(&info->tport, ch, flag);
if (oe == 1)
@@ -266,7 +265,7 @@ static void transmit_chars(struct serial_state *info)
amiga_custom.intreq = IF_TBE;
mb();
if (info->x_char) {
- amiga_custom.serdat = info->x_char | 0x100;
+ amiga_custom.serdat = info->x_char | 0x100;
mb();
info->icount.tx++;
info->x_char = 0;
@@ -276,7 +275,7 @@ static void transmit_chars(struct serial_state *info)
|| info->tport.tty->flow.stopped
|| info->tport.tty->hw_stopped) {
info->IER &= ~UART_IER_THRI;
- amiga_custom.intena = IF_TBE;
+ amiga_custom.intena = IF_TBE;
mb();
return;
}
@@ -295,7 +294,7 @@ static void transmit_chars(struct serial_state *info)
printk("THRE...");
#endif
if (info->xmit.head == info->xmit.tail) {
- amiga_custom.intena = IF_TBE;
+ amiga_custom.intena = IF_TBE;
mb();
info->IER &= ~UART_IER_THRI;
}
@@ -317,9 +316,8 @@ static void check_modem_status(struct serial_state *info)
/* update input line counters */
if (dstatus & SER_DSR)
icount->dsr++;
- if (dstatus & SER_DCD) {
+ if (dstatus & SER_DCD)
icount->dcd++;
- }
if (dstatus & SER_CTS)
icount->cts++;
wake_up_interruptible(&port->delta_msr_wait);
@@ -372,17 +370,16 @@ static void check_modem_status(struct serial_state *info)
}
}
}
-
-static irqreturn_t ser_vbl_int( int irq, void *data)
+static irqreturn_t ser_vbl_int(int irq, void *data)
{
- /* vbl is just a periodic interrupt we tie into to update modem status
*/
+ /* vbl is just a periodic interrupt we tie into to update modem status
*/
struct serial_state *info = data;
/*
* TBD - is it better to unregister from this interrupt or to
* ignore it if MSI is clear ?
*/
- if(info->IER & UART_IER_MSI)
- check_modem_status(info);
+ if (info->IER & UART_IER_MSI)
+ check_modem_status(info);
return IRQ_HANDLED;
}
@@ -410,10 +407,9 @@ static irqreturn_t ser_tx_int(int irq, void *dev_id)
if (amiga_custom.serdatr & SDR_TBE) {
#ifdef SERIAL_DEBUG_INTR
- printk("ser_tx_int...");
+ printk("ser_tx_int...");
#endif
-
- if (!info->tport.tty)
+ if (!info->tport.tty)
return IRQ_NONE;
transmit_chars(info);
@@ -443,7 +439,7 @@ static int startup(struct tty_struct *tty, struct
serial_state *info)
{
struct tty_port *port = &info->tport;
unsigned long flags;
- int retval=0;
+ int retval = 0;
unsigned long page;
page = get_zeroed_page(GFP_KERNEL);
@@ -490,7 +486,7 @@ static int startup(struct tty_struct *tty, struct
serial_state *info)
info->MCR = 0;
if (C_BAUD(tty))
- info->MCR = SER_DTR | SER_RTS;
+ info->MCR = SER_DTR | SER_RTS;
rtsdtr_ctrl(info->MCR);
clear_bit(TTY_IO_ERROR, &tty->flags);
@@ -571,7 +567,7 @@ static void change_speed(struct tty_struct *tty, struct
serial_state *info,
{
struct tty_port *port = &info->tport;
int quot = 0, baud_base, baud;
- unsigned cflag, cval = 0;
+ unsigned int cflag, cval = 0;
int bits;
unsigned long flags;
@@ -668,7 +664,7 @@ static void change_speed(struct tty_struct *tty, struct
serial_state *info,
if (I_IGNBRK(tty)) {
info->ignore_status_mask |= UART_LSR_BI;
/*
- * If we're ignore parity and break indicators, ignore
+ * If we're ignore parity and break indicators, ignore
* overruns too. (For real raw support).
*/
if (I_IGNPAR(tty))
@@ -682,16 +678,13 @@ static void change_speed(struct tty_struct *tty, struct
serial_state *info,
local_irq_save(flags);
{
- short serper;
-
+ short serper;
/* Set up the baud rate */
- serper = quot - 1;
+ serper = quot - 1;
/* Enable or disable parity bit */
-
- if(cval & UART_LCR_PARITY)
- serper |= (SERPER_PARENB);
-
+ if (cval & UART_LCR_PARITY)
+ serper |= (SERPER_PARENB);
amiga_custom.serper = serper;
mb();
}
@@ -744,7 +737,7 @@ static void rs_flush_chars(struct tty_struct *tty)
local_irq_restore(flags);
}
-static int rs_write(struct tty_struct * tty, const unsigned char *buf, int
count)
+static int rs_write(struct tty_struct *tty, const unsigned char *buf, int
count)
{
int c, ret = 0;
struct serial_state *info = tty->driver_data;
@@ -760,9 +753,8 @@ static int rs_write(struct tty_struct * tty, const unsigned
char *buf, int count
SERIAL_XMIT_SIZE);
if (count < c)
c = count;
- if (c <= 0) {
+ if (c <= 0)
break;
- }
memcpy(info->xmit.buf + info->xmit.head, buf, c);
info->xmit.head = ((info->xmit.head + c) &
(SERIAL_XMIT_SIZE-1));
@@ -820,20 +812,20 @@ static void rs_flush_buffer(struct tty_struct *tty)
static void rs_send_xchar(struct tty_struct *tty, char ch)
{
struct serial_state *info = tty->driver_data;
- unsigned long flags;
+ unsigned long flags;
info->x_char = ch;
if (ch) {
/* Make sure transmit interrupts are on */
- /* Check this ! */
- local_irq_save(flags);
- if(!(amiga_custom.intenar & IF_TBE)) {
- amiga_custom.intena = IF_SETCLR | IF_TBE;
- mb();
- /* set a pending Tx Interrupt, transmitter should restart
now */
- amiga_custom.intreq = IF_SETCLR | IF_TBE;
- mb();
+ /* Check this ! */
+ local_irq_save(flags);
+ if (!(amiga_custom.intenar & IF_TBE)) {
+ amiga_custom.intena = IF_SETCLR | IF_TBE;
+ mb();
+ /* set a pending Tx Interrupt, transmitter should
restart now */
+ amiga_custom.intreq = IF_SETCLR | IF_TBE;
+ mb();
}
local_irq_restore(flags);
@@ -844,12 +836,12 @@ static void rs_send_xchar(struct tty_struct *tty, char ch)
/*
* ------------------------------------------------------------
* rs_throttle()
- *
+ *
* This routine is called by the upper-layer tty layer to signal that
* incoming characters should be throttled.
* ------------------------------------------------------------
*/
-static void rs_throttle(struct tty_struct * tty)
+static void rs_throttle(struct tty_struct *tty)
{
struct serial_state *info = tty->driver_data;
unsigned long flags;
@@ -868,7 +860,7 @@ static void rs_throttle(struct tty_struct * tty)
local_irq_restore(flags);
}
-static void rs_unthrottle(struct tty_struct * tty)
+static void rs_unthrottle(struct tty_struct *tty)
{
struct serial_state *info = tty->driver_data;
unsigned long flags;
@@ -923,7 +915,7 @@ static int set_serial_info(struct tty_struct *tty, struct
serial_struct *ss)
struct serial_state *state = tty->driver_data;
struct tty_port *port = &state->tport;
bool change_spd;
- int retval = 0;
+ int retval = 0;
unsigned int close_delay, closing_wait;
tty_lock(tty);
@@ -990,11 +982,11 @@ static int set_serial_info(struct tty_struct *tty, struct
serial_struct *ss)
* get_lsr_info - get line status register info
*
* Purpose: Let user call ioctl() to get info when the UART physically
- * is emptied. On bus types like RS485, the transmitter must
- * release the bus after transmitting. This must be done when
- * the transmit shift register is empty, not be done when the
- * transmit holding register is empty. This functionality
- * allows an RS485 driver to be written in user space.
+ * is emptied. On bus types like RS485, the transmitter must
+ * release the bus after transmitting. This must be done when
+ * the transmit shift register is empty, not be done when the
+ * transmit holding register is empty. This functionality
+ * allows an RS485 driver to be written in user space.
*/
static int get_lsr_info(struct serial_state *info, unsigned int __user *value)
{
@@ -1065,9 +1057,9 @@ static int rs_break(struct tty_struct *tty, int
break_state)
local_irq_save(flags);
if (break_state == -1)
- amiga_custom.adkcon = AC_SETCLR | AC_UARTBRK;
+ amiga_custom.adkcon = AC_SETCLR | AC_UARTBRK;
else
- amiga_custom.adkcon = AC_UARTBRK;
+ amiga_custom.adkcon = AC_UARTBRK;
mb();
local_irq_restore(flags);
return 0;
@@ -1117,59 +1109,57 @@ static int rs_ioctl(struct tty_struct *tty,
if ((cmd != TIOCSERCONFIG) &&
(cmd != TIOCMIWAIT) && (cmd != TIOCGICOUNT)) {
if (tty_io_error(tty))
- return -EIO;
+ return -EIO;
}
-
switch (cmd) {
- case TIOCSERCONFIG:
- return 0;
+ case TIOCSERCONFIG:
+ return 0;
- case TIOCSERGETLSR: /* Get line status register */
- return get_lsr_info(info, argp);
+ case TIOCSERGETLSR: /* Get line status register */
+ return get_lsr_info(info, argp);
/*
* Wait for any of the 4 modem inputs (DCD,RI,DSR,CTS) to change
* - mask passed in arg for lines of interest
- * (use |'ed TIOCM_RNG/DSR/CD/CTS for masking)
- * Caller should use TIOCGICOUNT to see which one it was
+ * (use |'ed TIOCM_RNG/DSR/CD/CTS for masking)
+ * Caller should use TIOCGICOUNT to see which one it was
*/
- case TIOCMIWAIT:
+ case TIOCMIWAIT:
+ local_irq_save(flags);
+ /* note the counters on entry */
+ cprev = info->icount;
+ local_irq_restore(flags);
+ while (1) {
+ prepare_to_wait(&info->tport.delta_msr_wait,
+ &wait, TASK_INTERRUPTIBLE);
local_irq_save(flags);
- /* note the counters on entry */
- cprev = info->icount;
+ cnow = info->icount; /* atomic copy */
local_irq_restore(flags);
- while (1) {
- prepare_to_wait(&info->tport.delta_msr_wait,
- &wait, TASK_INTERRUPTIBLE);
- local_irq_save(flags);
- cnow = info->icount; /* atomic copy */
- local_irq_restore(flags);
- if (cnow.rng == cprev.rng && cnow.dsr ==
cprev.dsr &&
- cnow.dcd == cprev.dcd && cnow.cts ==
cprev.cts) {
- ret = -EIO; /* no change => error */
- break;
- }
- if ( ((arg & TIOCM_RNG) && (cnow.rng !=
cprev.rng)) ||
- ((arg & TIOCM_DSR) && (cnow.dsr !=
cprev.dsr)) ||
- ((arg & TIOCM_CD) && (cnow.dcd !=
cprev.dcd)) ||
- ((arg & TIOCM_CTS) && (cnow.cts !=
cprev.cts)) ) {
- ret = 0;
- break;
- }
- schedule();
- /* see if a signal did it */
- if (signal_pending(current)) {
- ret = -ERESTARTSYS;
- break;
- }
- cprev = cnow;
+ if (cnow.rng == cprev.rng && cnow.dsr == cprev.dsr &&
+ cnow.dcd == cprev.dcd && cnow.cts ==
cprev.cts) {
+ ret = -EIO; /* no change => error */
+ break;
}
- finish_wait(&info->tport.delta_msr_wait, &wait);
- return ret;
-
- default:
- return -ENOIOCTLCMD;
+ if (((arg & TIOCM_RNG) && (cnow.rng != cprev.rng)) ||
+ ((arg & TIOCM_DSR) && (cnow.dsr !=
cprev.dsr)) ||
+ ((arg & TIOCM_CD) && (cnow.dcd !=
cprev.dcd)) ||
+ ((arg & TIOCM_CTS) && (cnow.cts !=
cprev.cts))) {
+ ret = 0;
+ break;
+ }
+ schedule();
+ /* see if a signal did it */
+ if (signal_pending(current)) {
+ ret = -ERESTARTSYS;
+ break;
+ }
+ cprev = cnow;
}
+ finish_wait(&info->tport.delta_msr_wait, &wait);
+ return ret;
+ default:
+ return -ENOIOCTLCMD;
+ }
return 0;
}
@@ -1220,14 +1210,14 @@ static void rs_set_termios(struct tty_struct *tty,
struct ktermios *old_termios)
/*
* ------------------------------------------------------------
* rs_close()
- *
+ *
* This routine is called when the serial port gets closed. First, we
* wait for the last remaining data to be sent. Then, we unlink its
* async structure from the interrupt chain if necessary, and we free
* that IRQ if nothing is left in the chain.
* ------------------------------------------------------------
*/
-static void rs_close(struct tty_struct *tty, struct file * filp)
+static void rs_close(struct tty_struct *tty, struct file *filp)
{
struct serial_state *state = tty->driver_data;
struct tty_port *port = &state->tport;
@@ -1243,8 +1233,8 @@ static void rs_close(struct tty_struct *tty, struct file
* filp)
*/
state->read_status_mask &= ~UART_LSR_DR;
if (tty_port_initialized(port)) {
- /* disable receive interrupts */
- amiga_custom.intena = IF_RBF;
+ /* disable receive interrupts */
+ amiga_custom.intena = IF_RBF;
mb();
/* clear any pending receive interrupt */
amiga_custom.intreq = IF_RBF;
@@ -1259,7 +1249,7 @@ static void rs_close(struct tty_struct *tty, struct file
* filp)
}
shutdown(tty, state);
rs_flush_buffer(tty);
-
+
tty_ldisc_flush(tty);
port->tty = NULL;
@@ -1281,7 +1271,7 @@ static void rs_wait_until_sent(struct tty_struct *tty,
int timeout)
* Set the check interval to be 1/5 of the estimated time to
* send a single character, and make it at least 1. The check
* interval should also be less than the timeout.
- *
+ *
* Note: we have to use pretty tight timings here to satisfy
* the NIST-PCTS.
*/
@@ -1290,7 +1280,7 @@ static void rs_wait_until_sent(struct tty_struct *tty,
int timeout)
if (char_time == 0)
char_time = 1;
if (timeout)
- char_time = min_t(unsigned long, char_time, timeout);
+ char_time = min_t(unsigned long, char_time, timeout);
/*
* If the transmitter hasn't cleared in twice the approximate
* amount of time to send the entire FIFO, it probably won't
@@ -1306,7 +1296,7 @@ static void rs_wait_until_sent(struct tty_struct *tty,
int timeout)
printk("In rs_wait_until_sent(%d) check=%lu...", timeout, char_time);
printk("jiff=%lu...", jiffies);
#endif
- while(!((lsr = amiga_custom.serdatr) & SDR_TSRE)) {
+ while (!((lsr = amiga_custom.serdatr) & SDR_TSRE)) {
#ifdef SERIAL_DEBUG_RS_WAIT_UNTIL_SENT
printk("serdatr = %d (jiff=%lu)...", lsr, jiffies);
#endif
@@ -1344,7 +1334,7 @@ static void rs_hangup(struct tty_struct *tty)
* the IRQ chain. It also performs the serial-specific
* initialization for the tty structure.
*/
-static int rs_open(struct tty_struct *tty, struct file * filp)
+static int rs_open(struct tty_struct *tty, struct file *filp)
{
struct tty_port *port = tty->port;
struct serial_state *info = container_of(port, struct serial_state,
@@ -1356,9 +1346,8 @@ static int rs_open(struct tty_struct *tty, struct file *
filp)
tty->driver_data = info;
retval = startup(tty, info);
- if (retval) {
+ if (retval)
return retval;
- }
return tty_port_block_til_ready(port, tty, filp);
}
@@ -1382,15 +1371,15 @@ static inline void line_info(struct seq_file *m, int
line,
stat_buf[0] = 0;
stat_buf[1] = 0;
- if(!(control & SER_RTS))
+ if (!(control & SER_RTS))
strcat(stat_buf, "|RTS");
- if(!(status & SER_CTS))
+ if (!(status & SER_CTS))
strcat(stat_buf, "|CTS");
- if(!(control & SER_DTR))
+ if (!(control & SER_DTR))
strcat(stat_buf, "|DTR");
- if(!(status & SER_DSR))
+ if (!(status & SER_DSR))
strcat(stat_buf, "|DSR");
- if(!(status & SER_DCD))
+ if (!(status & SER_DCD))
strcat(stat_buf, "|CD");
if (state->quot)
@@ -1418,7 +1407,7 @@ static inline void line_info(struct seq_file *m, int line,
static int rs_proc_show(struct seq_file *m, void *v)
{
- seq_printf(m, "serinfo:1.0 driver:4.30\n");
+ seq_puts(m, "serinfo:1.0 driver:4.30\n");
line_info(m, 0, &serial_state);
return 0;
}
@@ -1618,7 +1607,7 @@ static void amiga_serial_putc(char c)
* The console must be locked when we get here.
*/
static void serial_console_write(struct console *co, const char *s,
- unsigned count)
+ unsigned int count)
{
unsigned short intena = amiga_custom.intenar;
diff --git a/drivers/tty/ehv_bytechan.c b/drivers/tty/ehv_bytechan.c
index 19d32cb6a..c41c4c07b 100644
--- a/drivers/tty/ehv_bytechan.c
+++ b/drivers/tty/ehv_bytechan.c
@@ -324,8 +324,9 @@ static int __init ehv_bc_console_init(void)
#endif
/* add_preferred_console() must be called before register_console(),
- otherwise it won't work. However, we don't want to enumerate all the
- byte channels here, either, since we only care about one. */
+ * otherwise it won't work. However, we don't want to enumerate all the
+ * byte channels here, either, since we only care about one.
+ */
add_preferred_console(ehv_bc_console.name, ehv_bc_console.index, NULL);
register_console(&ehv_bc_console);
diff --git a/drivers/tty/goldfish.c b/drivers/tty/goldfish.c
index 5ed19a985..61ccbf670 100644
--- a/drivers/tty/goldfish.c
+++ b/drivers/tty/goldfish.c
@@ -173,6 +173,7 @@ static void goldfish_tty_shutdown(struct tty_port *port)
static int goldfish_tty_open(struct tty_struct *tty, struct file *filp)
{
struct goldfish_tty *qtty = &goldfish_ttys[tty->index];
+
return tty_port_open(&qtty->port, tty, filp);
}
@@ -202,6 +203,7 @@ static unsigned int goldfish_tty_chars_in_buffer(struct
tty_struct *tty)
{
struct goldfish_tty *qtty = &goldfish_ttys[tty->index];
void __iomem *base = qtty->base;
+
return __raw_readl(base + GOLDFISH_TTY_REG_BYTES_READY);
}
--
2.32.0
