| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20220615103601.131489-1-sinhaojas67@gmail.com>
Date: Wed, 15 Jun 2022 16:06:01 +0530
From: Ojas Sinha <sinhaojas67@...il.com>
To: gregkh@...uxfoundation.org, jirislaby@...nel.org,
linux-kernel@...r.kernel.org
Cc: Ojas Sinha <sinhaojas67@...il.com>
Subject: [PATCH] drivers/tty: Fix code style errors in amiserial.c
Signed-off-by: Ojas Sinha <sinhaojas67@...il.com>
---
drivers/tty/amiserial.c | 154 ++++++++++++++++++++--------------------
1 file changed, 77 insertions(+), 77 deletions(-)
diff --git a/drivers/tty/amiserial.c b/drivers/tty/amiserial.c
index afb2d373dd47..6eb57677cbba 100644
--- a/drivers/tty/amiserial.c
+++ b/drivers/tty/amiserial.c
@@ -17,7 +17,7 @@
* Richard Lucock 28/12/99
*
* Copyright (C) 1991, 1992 Linus Torvalds
- * Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997,
+ * Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997,
* 1998, 1999 Theodore Ts'o
*
*/
@@ -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,9 +189,9 @@ static void receive_chars(struct serial_state *info)
amiga_custom.intreq = IF_RBF;
mb();
- if((serdatr & 0x1ff) == 0)
+ if ((serdatr & 0x1ff) == 0)
status |= UART_LSR_BI;
- if(serdatr & SDR_OVRUN)
+ if (serdatr & SDR_OVRUN)
status |= UART_LSR_OE;
ch = serdatr & 0xff;
@@ -266,7 +266,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 +276,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 +295,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;
}
@@ -373,15 +373,15 @@ 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)
+ if (info->IER & UART_IER_MSI)
check_modem_status(info);
return IRQ_HANDLED;
}
@@ -443,7 +443,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);
@@ -664,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))
@@ -685,7 +685,7 @@ static void change_speed(struct tty_struct *tty, struct serial_state *info,
/* Enable or disable parity bit */
- if(cval & UART_LCR_PARITY)
+ if (cval & UART_LCR_PARITY)
serper |= (SERPER_PARENB);
amiga_custom.serper = serper;
@@ -740,7 +740,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;
@@ -816,15 +816,15 @@ 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)) {
+ /* 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 */
@@ -840,12 +840,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;
@@ -864,7 +864,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;
@@ -990,7 +990,7 @@ static int set_serial_info(struct tty_struct *tty, struct serial_struct *ss)
* 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.
+ * allows an RS485 driver to be written in user space.
*/
static int get_lsr_info(struct serial_state *info, unsigned int __user *value)
{
@@ -1117,54 +1117,54 @@ static int rs_ioctl(struct tty_struct *tty,
}
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
- */
- case TIOCMIWAIT:
+ /*
+ * 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
+ */
+ 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;
+ }
+ 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;
}
- finish_wait(&info->tport.delta_msr_wait, &wait);
- return ret;
+ 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;
+ default:
+ return -ENOIOCTLCMD;
}
return 0;
}
@@ -1216,14 +1216,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;
@@ -1239,8 +1239,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;
@@ -1255,7 +1255,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;
@@ -1277,7 +1277,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.
*/
@@ -1302,7 +1302,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
@@ -1340,7 +1340,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,
@@ -1378,15 +1378,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)
--
2.36.1
Powered by blists - more mailing lists