tty/serial: bool conversions and cleanups
Subsystems (20)
v4 cover tty/serial: bool conversions and cleanups
There are number of functions in tty/serial which have arguments or return types that expect/behave like bool. Likely due to them existing before bool was available, other types are used. Make conversions to bool and cleanups.
v4:
- Removed most of the USB serial changes from this series
v3:
- moxa: Fix function signature in comment
- moxa: Rearrange comment (0: off, 1: on) removal from rename change to bool change (effect is internal to the series)
v2:
- Call dtr/rts parameters/variables consistently "active"
- Don't chain one return statement with ||
- Don't change function signatures to >80 chars ("while at it")
- moxa: differentiated dtr and status variables
Ilpo Järvinen (12):
tty: Cleanup tty_port_set_initialized() bool parameter
tty: Cleamup tty_port_set_suspended() bool parameter
tty: Cleanup tty_port_set_active() bool parameter
tty: moxa: Make local var storing tty_port_initialized() bool
serial: Convert uart_{,port_}startup() init_hw param to bool
tty: Convert ->carrier_raised() and callchains to bool
tty: Convert ->dtr_rts() to take bool argument tty/serial: Make ->dcd_change()+uart_handle_dcd_change() status bool
active
serial: Make uart_handle_cts_change() status param bool active
tty: Return bool from tty_termios_hw_change()
tty: Call ->dtr_rts() parameter active consistently
tty: moxa: Rename dtr/rts parameters/variables to active
drivers/char/pcmcia/synclink_cs.c | 18 +++---- drivers/ipack/devices/ipoctal.c | 4 +- drivers/mmc/core/sdio_uart.c | 13 +++-- drivers/pps/clients/pps-ldisc.c | 6 +-- drivers/s390/char/con3215.c | 4 +- drivers/staging/greybus/uart.c | 4 +- drivers/tty/amiserial.c | 12 ++--- drivers/tty/hvc/hvc_console.c | 4 +- drivers/tty/hvc/hvc_console.h | 2 +- drivers/tty/hvc/hvc_iucv.c | 6 +-- drivers/tty/moxa.c | 82 ++++++++++++++++--------------- drivers/tty/mxser.c | 11 +++-- drivers/tty/n_gsm.c | 16 +++--- drivers/tty/serial/imx.c | 2 +- drivers/tty/serial/max3100.c | 2 +- drivers/tty/serial/max310x.c | 3 +- drivers/tty/serial/serial_core.c | 65 ++++++++++++------------ drivers/tty/serial/sunhv.c | 8 +-- drivers/tty/synclink_gt.c | 21 ++++---- drivers/tty/tty_ioctl.c | 8 +-- drivers/tty/tty_port.c | 22 ++++----- drivers/usb/class/cdc-acm.c | 4 +- drivers/usb/serial/console.c | 2 +- drivers/usb/serial/usb-serial.c | 6 +-- include/linux/serial_core.h | 6 +-- include/linux/tty.h | 2 +- include/linux/tty_ldisc.h | 4 +- include/linux/tty_port.h | 10 ++-- net/bluetooth/rfcomm/tty.c | 2 +- 29 files changed, 173 insertions(+), 176 deletions(-)
Signature · 1 line
2.30.2
PATCH v4 1/12 tty: Cleanup tty_port_set_initialized() bool parameter
Make callers pass true/false consistently for bool val.
--- drivers/char/pcmcia/synclink_cs.c | 4 ++-- drivers/ipack/devices/ipoctal.c | 4 ++-- drivers/s390/char/con3215.c | 4 ++-- drivers/tty/amiserial.c | 4 ++-- drivers/tty/moxa.c | 2 +- drivers/tty/mxser.c | 2 +- drivers/tty/n_gsm.c | 4 ++-- drivers/tty/serial/serial_core.c | 6 +++--- drivers/tty/synclink_gt.c | 4 ++-- drivers/tty/tty_port.c | 4 ++-- drivers/usb/serial/console.c | 2 +- 11 files changed, 20 insertions(+), 20 deletions(-)
drivers/char/pcmcia/synclink_cs.c +2 -2
@@ -1309,7 +1309,7 @@ static int startup(MGSLPC_INFO * info, struct tty_struct *tty)if (tty)clear_bit (TTY_IO_ERROR , &tty->flags); -tty_port_set_initialized (&info->port,1 ); +tty_port_set_initialized (&info->port, true);return 0 ; }
@@ -1359,7 +1359,7 @@ static void shutdown(MGSLPC_INFO * info, struct tty_struct *tty)if (tty)set_bit (TTY_IO_ERROR , &tty->flags); -tty_port_set_initialized (&info->port,0 ); +tty_port_set_initialized (&info->port, false); }static void mgslpc_program_hw (MGSLPC_INFO *info,struct tty_struct *tty)
drivers/ipack/devices/ipoctal.c +2 -2
@@ -647,7 +647,7 @@ static void ipoctal_hangup(struct tty_struct *tty)tty_port_hangup (&channel->tty_port);ipoctal_reset_channel (channel); -tty_port_set_initialized (&channel->tty_port,0 ); +tty_port_set_initialized (&channel->tty_port, false);wake_up_interruptible (&channel->tty_port.open_wait); }
@@ -659,7 +659,7 @@ static void ipoctal_shutdown(struct tty_struct *tty)return ;ipoctal_reset_channel (channel); -tty_port_set_initialized (&channel->tty_port,0 ); +tty_port_set_initialized (&channel->tty_port, false); }static void ipoctal_cleanup (struct tty_struct *tty)
drivers/s390/char/con3215.c +2 -2
@@ -629,7 +629,7 @@ static int raw3215_startup(struct raw3215_info *raw)if (tty_port_initialized (&raw->port))return 0 ; raw->line_pos =0 ; -tty_port_set_initialized (&raw->port,1 ); +tty_port_set_initialized (&raw->port, true);spin_lock_irqsave (get_ccwdev_lock (raw->cdev), flags);raw3215_try_io (raw);spin_unlock_irqrestore (get_ccwdev_lock (raw->cdev), flags);
@@ -659,7 +659,7 @@ static void raw3215_shutdown(struct raw3215_info *raw)spin_lock_irqsave (get_ccwdev_lock (raw->cdev), flags);remove_wait_queue (&raw->empty_wait, &wait);set_current_state (TASK_RUNNING ); -tty_port_set_initialized (&raw->port,1 ); +tty_port_set_initialized (&raw->port, true); }spin_unlock_irqrestore (get_ccwdev_lock (raw->cdev), flags); }
drivers/tty/amiserial.c +2 -2
@@ -502,7 +502,7 @@ static int startup(struct tty_struct *tty, struct serial_state *info)*/ change_speed (tty, info,NULL ); -tty_port_set_initialized (port,1 ); +tty_port_set_initialized (port, true);local_irq_restore (flags);return 0 ;
@@ -556,7 +556,7 @@ static void shutdown(struct tty_struct *tty, struct serial_state *info)set_bit (TTY_IO_ERROR , &tty->flags); -tty_port_set_initialized (&info->tport,0 ); +tty_port_set_initialized (&info->tport, false);local_irq_restore (flags); }
drivers/tty/moxa.c +1 -1
@@ -1484,7 +1484,7 @@ static int moxa_open(struct tty_struct *tty, struct file *filp)MoxaPortLineCtrl (ch,1 ,1 );MoxaPortEnable (ch);MoxaSetFifo (ch, ch->type ==PORT_16550A ); -tty_port_set_initialized (&ch->port,1 ); +tty_port_set_initialized (&ch->port, true); }mutex_unlock (&ch->port.mutex);mutex_unlock (&moxa_openlock);
drivers/tty/mxser.c +1 -1
@@ -1063,7 +1063,7 @@ static int mxser_set_serial_info(struct tty_struct *tty, }else { retval =mxser_activate (port, tty);if (retval ==0 ) -tty_port_set_initialized (port,1 ); +tty_port_set_initialized (port, true); }mutex_unlock (&port->mutex);return retval;
drivers/tty/n_gsm.c +2 -2
@@ -2059,7 +2059,7 @@ static void gsm_dlci_close(struct gsm_dlci *dlci)tty_port_tty_hangup (&dlci->port, false);gsm_dlci_clear_queues (dlci->gsm, dlci);/* Ensure that gsmtty_open() can return. */ -tty_port_set_initialized (&dlci->port,0 ); +tty_port_set_initialized (&dlci->port, false);wake_up_interruptible (&dlci->port.open_wait); }else dlci->gsm->dead = true;
@@ -3880,7 +3880,7 @@ static int gsmtty_open(struct tty_struct *tty, struct file *filp) dlci->modem_rx =0 ;/* We could in theory open and close before we wait - eg if we get a DM straight back. This is ok as that will have caused a hangup */ -tty_port_set_initialized (port,1 ); +tty_port_set_initialized (port, true);/* Start sending off SABM messages */ if (gsm->initiator)gsm_dlci_begin_open (dlci);
drivers/tty/serial/serial_core.c +3 -3
@@ -290,7 +290,7 @@ static void uart_shutdown(struct tty_struct *tty, struct uart_state *state)set_bit (TTY_IO_ERROR , &tty->flags);if (tty_port_initialized (port)) { -tty_port_set_initialized (port,0 ); +tty_port_set_initialized (port, false);/* * Turn off DTR and RTS early.
@@ -2347,7 +2347,7 @@ int uart_suspend_port(struct uart_driver *drv, struct uart_port *uport)unsigned int mctrl;tty_port_set_suspended (port,1 ); -tty_port_set_initialized (port,0 ); +tty_port_set_initialized (port, false);spin_lock_irq (&uport->lock); ops->stop_tx (uport);
@@ -2458,7 +2458,7 @@ int uart_resume_port(struct uart_driver *drv, struct uart_port *uport)uart_rs485_config (uport); ops->start_tx (uport);spin_unlock_irq (&uport->lock); -tty_port_set_initialized (port,1 ); +tty_port_set_initialized (port, true); }else {/* * Failed to resume - maybe hardware went away?
drivers/tty/synclink_gt.c +2 -2
@@ -2354,7 +2354,7 @@ static int startup(struct slgt_info *info)if (info->port.tty)clear_bit (TTY_IO_ERROR , &info->port.tty->flags); -tty_port_set_initialized (&info->port,1 ); +tty_port_set_initialized (&info->port, true);return 0 ; }
@@ -2401,7 +2401,7 @@ static void shutdown(struct slgt_info *info)if (info->port.tty)set_bit (TTY_IO_ERROR , &info->port.tty->flags); -tty_port_set_initialized (&info->port,0 ); +tty_port_set_initialized (&info->port, false); }static void program_hw (struct slgt_info *info)
drivers/tty/tty_port.c +2 -2
@@ -367,7 +367,7 @@ static void tty_port_shutdown(struct tty_port *port, struct tty_struct *tty) goto out;if (tty_port_initialized (port)) { -tty_port_set_initialized (port,0 ); +tty_port_set_initialized (port, false);/* * Drop DTR/RTS if HUPCL is set. This causes any attached * modem to hang up the line.
@@ -788,7 +788,7 @@ int tty_port_open(struct tty_port *port, struct tty_struct *tty,return retval; } } -tty_port_set_initialized (port,1 ); +tty_port_set_initialized (port, true); }mutex_unlock (&port->mutex);return tty_port_block_til_ready (port, tty, filp);
drivers/usb/serial/console.c +1 -1
@@ -169,7 +169,7 @@ static int usb_console_setup(struct console *co, char *options)tty_save_termios (tty);tty_kref_put (tty); } -tty_port_set_initialized (&port->port,1 ); +tty_port_set_initialized (&port->port, true); }/* Now that any required fake tty operations are completed restore * the tty port count */
Signature · 7 lines
2.30.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v4 2/12 tty: Cleamup tty_port_set_suspended() bool parameter
In reply to Ilpo JärvinenMake callers pass true/false consistently for bool val.
--- drivers/tty/serial/serial_core.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/tty/serial/serial_core.c +4 -4
@@ -312,7 +312,7 @@ static void uart_shutdown(struct tty_struct *tty, struct uart_state *state)* a DCD drop (hangup) at just the right time. Clear suspended bit so * we don't try to resume a port that has been shutdown. */ -tty_port_set_suspended (port,0 ); +tty_port_set_suspended (port, false);/* * Do not free() the transmit buffer page under the port lock since
@@ -1725,7 +1725,7 @@ static void uart_tty_port_shutdown(struct tty_port *port)* a DCD drop (hangup) at just the right time. Clear suspended bit so * we don't try to resume a port that has been shutdown. */ -tty_port_set_suspended (port,0 ); +tty_port_set_suspended (port, false);/* * Free the transmit buffer.
@@ -2346,7 +2346,7 @@ int uart_suspend_port(struct uart_driver *drv, struct uart_port *uport)int tries;unsigned int mctrl; -tty_port_set_suspended (port,1 ); +tty_port_set_suspended (port, true);tty_port_set_initialized (port, false);spin_lock_irq (&uport->lock);
@@ -2469,7 +2469,7 @@ int uart_resume_port(struct uart_driver *drv, struct uart_port *uport) } } -tty_port_set_suspended (port,0 ); +tty_port_set_suspended (port, false); }mutex_unlock (&port->mutex);
Signature · 1 line
2.30.2
PATCH v4 3/12 tty: Cleanup tty_port_set_active() bool parameter
In reply to Ilpo JärvinenMake callers pass true/false consistently for bool val.
--- drivers/tty/amiserial.c | 2 +- drivers/tty/serial/serial_core.c | 4 ++-- drivers/tty/synclink_gt.c | 6 +++--- drivers/tty/tty_port.c | 10 +++++----- 4 files changed, 11 insertions(+), 11 deletions(-)
drivers/tty/amiserial.c +1 -1
@@ -1329,7 +1329,7 @@ static void rs_hangup(struct tty_struct *tty)rs_flush_buffer (tty);shutdown (tty, info); info->tport.count =0 ; -tty_port_set_active (&info->tport,0 ); +tty_port_set_active (&info->tport, false); info->tport.tty =NULL ;wake_up_interruptible (&info->tport.open_wait); }
drivers/tty/serial/serial_core.c +2 -2
@@ -1827,7 +1827,7 @@ static void uart_hangup(struct tty_struct *tty)spin_lock_irqsave (&port->lock, flags); port->count =0 ;spin_unlock_irqrestore (&port->lock, flags); -tty_port_set_active (port,0 ); +tty_port_set_active (port, false);tty_port_tty_set (port,NULL );if (uport && !uart_console (uport))uart_change_pm (state,UART_PM_STATE_OFF );
@@ -1945,7 +1945,7 @@ static int uart_port_activate(struct tty_port *port, struct tty_struct *tty)*/ ret =uart_startup (tty, state,0 );if (ret >0 ) -tty_port_set_active (port,1 ); +tty_port_set_active (port, true);return ret; }
drivers/tty/synclink_gt.c +3 -3
@@ -694,7 +694,7 @@ static void hangup(struct tty_struct *tty) info->port.count =0 ; info->port.tty =NULL ;spin_unlock_irqrestore (&info->port.lock, flags); -tty_port_set_active (&info->port,0 ); +tty_port_set_active (&info->port, false);mutex_unlock (&info->port.mutex);wake_up_interruptible (&info->port.open_wait);
@@ -3169,7 +3169,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,if (filp->f_flags &O_NONBLOCK ||tty_io_error (tty)) {/* nonblock mode is set or port is not enabled */ -tty_port_set_active (port,1 ); +tty_port_set_active (port, true);return 0 ; }
@@ -3226,7 +3226,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp, port->blocked_open--;if (!retval) -tty_port_set_active (port,1 ); +tty_port_set_active (port, true);DBGINFO (("%s block_til_ready ready, rc=%d\n" , tty->driver->name, retval));return retval;
drivers/tty/tty_port.c +5 -5
@@ -403,7 +403,7 @@ void tty_port_hangup(struct tty_port *port)set_bit (TTY_IO_ERROR , &tty->flags); port->tty =NULL ;spin_unlock_irqrestore (&port->lock, flags); -tty_port_set_active (port,0 ); +tty_port_set_active (port, false);tty_port_shutdown (port, tty);tty_kref_put (tty);wake_up_interruptible (&port->open_wait);
@@ -518,14 +518,14 @@ int tty_port_block_til_ready(struct tty_port *port,* the port has just hung up or is in another error state. */ if (tty_io_error (tty)) { -tty_port_set_active (port,1 ); +tty_port_set_active (port, true);return 0 ; }if (filp ==NULL || (filp->f_flags &O_NONBLOCK )) {/* Indicate we are open */ if (C_BAUD (tty))tty_port_raise_dtr_rts (port); -tty_port_set_active (port,1 ); +tty_port_set_active (port, true);return 0 ; }
@@ -588,7 +588,7 @@ int tty_port_block_til_ready(struct tty_port *port, port->blocked_open--;spin_unlock_irqrestore (&port->lock, flags);if (retval ==0 ) -tty_port_set_active (port,1 ); +tty_port_set_active (port, true);return retval; }EXPORT_SYMBOL (tty_port_block_til_ready);
@@ -695,7 +695,7 @@ void tty_port_close_end(struct tty_port *port, struct tty_struct *tty)wake_up_interruptible (&port->open_wait); }spin_unlock_irqrestore (&port->lock, flags); -tty_port_set_active (port,0 ); +tty_port_set_active (port, false); }EXPORT_SYMBOL (tty_port_close_end);
Signature · 1 line
2.30.2
PATCH v4 4/12 tty: moxa: Make local var storing tty_port_initialized() bool
In reply to Ilpo JärvinenReturn type of tty_port_initialized() is bool, use matching type for the local variable.
Also reorder the local vars to reverse-xmas-tree while at it.
--- drivers/tty/moxa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/tty/moxa.c +1 -1
@@ -1664,8 +1664,8 @@ static int moxa_poll_port(struct moxa_port *p, unsigned int handle, u16 __iomem *ip) {struct tty_struct *tty =tty_port_tty_get (&p->port); +bool inited =tty_port_initialized (&p->port);void __iomem *ofsAddr; -unsigned int inited =tty_port_initialized (&p->port);u16 intr;if (tty) {
Signature · 1 line
2.30.2
PATCH v4 5/12 serial: Convert uart_{,port_}startup() init_hw param to bool
In reply to Ilpo JärvinenConvert init_hw parameter in uart_startup() and uart_port_startup() to bool as code treats them like bool.
--- drivers/tty/serial/serial_core.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/tty/serial/serial_core.c +5 -5
@@ -182,7 +182,7 @@ static void uart_port_dtr_rts(struct uart_port *uport, int raise)* will be serialised by the per-port mutex. */ static int uart_port_startup (struct tty_struct *tty,struct uart_state *state, -int init_hw) +bool init_hw) {struct uart_port *uport =uart_port_check (state);unsigned long flags;
@@ -254,7 +254,7 @@ static int uart_port_startup(struct tty_struct *tty, struct uart_state *state, }static int uart_startup (struct tty_struct *tty,struct uart_state *state, -int init_hw) +bool init_hw) {struct tty_port *port = &state->port;int retval;
@@ -997,7 +997,7 @@ static int uart_set_info(struct tty_struct *tty, struct tty_port *port,uart_change_speed (tty, state,NULL ); } }else { - retval =uart_startup (tty, state,1 ); + retval =uart_startup (tty, state, true);if (retval ==0 )tty_port_set_initialized (port, true);if (retval >0 )
@@ -1165,7 +1165,7 @@ static int uart_do_autoconfig(struct tty_struct *tty, struct uart_state *state)*/ uport->ops->config_port (uport, flags); - ret =uart_startup (tty, state,1 ); + ret =uart_startup (tty, state, true);if (ret ==0 )tty_port_set_initialized (port, true);if (ret >0 )
@@ -1943,7 +1943,7 @@ static int uart_port_activate(struct tty_port *port, struct tty_struct *tty)/* * Start up the serial port. */ - ret =uart_startup (tty, state,0 ); + ret =uart_startup (tty, state, false);if (ret >0 )tty_port_set_active (port, true);
Signature · 1 line
2.30.2
PATCH v4 6/12 tty: Convert ->carrier_raised() and callchains to bool
In reply to Ilpo JärvinenReturn boolean from ->carrier_raised() instead of 0 and 1. Make the return type change also to tty_port_carrier_raised() that makes the ->carrier_raised() call (+ cd variable in moxa into which its return value is stored).
Also cleans up a few unnecessary constructs related to this change:
return xx ? 1 : 0; -> return xx; if (xx) return 1; return 0; -> return xx;
--- drivers/char/pcmcia/synclink_cs.c | 8 +++----- drivers/mmc/core/sdio_uart.c | 7 +++---- drivers/tty/amiserial.c | 2 +- drivers/tty/moxa.c | 4 ++-- drivers/tty/mxser.c | 5 +++-- drivers/tty/n_gsm.c | 8 ++++---- drivers/tty/serial/serial_core.c | 9 ++++----- drivers/tty/synclink_gt.c | 7 ++++--- drivers/tty/tty_port.c | 4 ++-- drivers/usb/serial/usb-serial.c | 4 ++-- include/linux/tty_port.h | 6 +++--- net/bluetooth/rfcomm/tty.c | 2 +- 12 files changed, 32 insertions(+), 34 deletions(-)
drivers/char/pcmcia/synclink_cs.c +3 -5
@@ -377,7 +377,7 @@ static void async_mode(MGSLPC_INFO *info);static void tx_timeout (struct timer_list *t); -static int carrier_raised (struct tty_port *port); +static bool carrier_raised (struct tty_port *port);static void dtr_rts (struct tty_port *port,int onoff);#if SYNCLINK_GENERIC_HDLC
@@ -2430,7 +2430,7 @@ static void mgslpc_hangup(struct tty_struct *tty)tty_port_hangup (&info->port); } -static int carrier_raised (struct tty_port *port) +static bool carrier_raised (struct tty_port *port) {MGSLPC_INFO *info =container_of (port,MGSLPC_INFO , port);unsigned long flags;
@@ -2439,9 +2439,7 @@ static int carrier_raised(struct tty_port *port)get_signals (info);spin_unlock_irqrestore (&info->lock, flags); -if (info->serial_signals & SerialSignal_DCD) -return 1 ; -return 0 ; +return info->serial_signals & SerialSignal_DCD; }static void dtr_rts (struct tty_port *port,int onoff)
drivers/mmc/core/sdio_uart.c +3 -4
@@ -526,7 +526,7 @@ static void sdio_uart_irq(struct sdio_func *func) port->in_sdio_uart_irq =NULL ; } -static int uart_carrier_raised (struct tty_port *tport) +static bool uart_carrier_raised (struct tty_port *tport) {struct sdio_uart_port *port = container_of(tport, struct sdio_uart_port, port);
@@ -535,9 +535,8 @@ static int uart_carrier_raised(struct tty_port *tport)return 1 ; ret =sdio_uart_get_mctrl (port);sdio_uart_release_func (port); -if (ret &TIOCM_CAR ) -return 1 ; -return 0 ; + +return ret &TIOCM_CAR ; }/**
drivers/tty/amiserial.c +1 -1
@@ -1454,7 +1454,7 @@ static const struct tty_operations serial_ops = { .proc_show = rs_proc_show, }; -static int amiga_carrier_raised (struct tty_port *port) +static bool amiga_carrier_raised (struct tty_port *port) {return !(ciab.pra &SER_DCD ); }
drivers/tty/moxa.c +2 -2
@@ -501,7 +501,7 @@ static int moxa_tiocmset(struct tty_struct *tty,static void moxa_poll (struct timer_list *);static void moxa_set_tty_param (struct tty_struct *,const struct ktermios *);static void moxa_shutdown (struct tty_port *); -static int moxa_carrier_raised (struct tty_port *); +static bool moxa_carrier_raised (struct tty_port *);static void moxa_dtr_rts (struct tty_port *,int );/* * moxa board interface functions:
@@ -1432,7 +1432,7 @@ static void moxa_shutdown(struct tty_port *port)MoxaPortFlushData (ch,2 ); } -static int moxa_carrier_raised (struct tty_port *port) +static bool moxa_carrier_raised (struct tty_port *port) { struct moxa_port *ch = container_of(port, struct moxa_port, port);int dcd;
drivers/tty/mxser.c +3 -2
@@ -458,10 +458,11 @@ static void __mxser_stop_tx(struct mxser_port *info)outb (info->IER, info->ioaddr +UART_IER ); } -static int mxser_carrier_raised (struct tty_port *port) +static bool mxser_carrier_raised (struct tty_port *port) { struct mxser_port *mp = container_of(port, struct mxser_port, port); -return (inb (mp->ioaddr +UART_MSR ) &UART_MSR_DCD )?1 :0 ; + +return inb (mp->ioaddr +UART_MSR ) &UART_MSR_DCD ; }static void mxser_dtr_rts (struct tty_port *port,int on)
drivers/tty/n_gsm.c +4 -4
@@ -3770,16 +3770,16 @@ static int gsm_modem_update(struct gsm_dlci *dlci, u8 brk)return -EPROTONOSUPPORT ; } -static int gsm_carrier_raised (struct tty_port *port) +static bool gsm_carrier_raised (struct tty_port *port) { struct gsm_dlci *dlci = container_of(port, struct gsm_dlci, port);struct gsm_mux *gsm = dlci->gsm;/* Not yet open so no carrier info */ if (dlci->state !=DLCI_OPEN ) -return 0 ; +return false;if (debug &DBG_CD_ON ) -return 1 ; +return true;/* * Basic mode with control channel in ADM mode may not respond
@@ -3787,7 +3787,7 @@ static int gsm_carrier_raised(struct tty_port *port)*/ if (gsm->encoding ==GSM_BASIC_OPT && gsm->dlci[0 ]->mode ==DLCI_MODE_ADM && !dlci->modem_rx) -return 1 ; +return true;return dlci->modem_rx &TIOCM_CD ; }
drivers/tty/serial/serial_core.c +4 -5
@@ -1861,7 +1861,7 @@ static void uart_port_shutdown(struct tty_port *port) } } -static int uart_carrier_raised (struct tty_port *port) +static bool uart_carrier_raised (struct tty_port *port) { struct uart_state *state = container_of(port, struct uart_state, port);struct uart_port *uport;
@@ -1875,15 +1875,14 @@ static int uart_carrier_raised(struct tty_port *port)* continue and not sleep */ if (WARN_ON (!uport)) -return 1 ; +return true;spin_lock_irq (&uport->lock);uart_enable_ms (uport); mctrl = uport->ops->get_mctrl (uport);spin_unlock_irq (&uport->lock);uart_port_deref (uport); -if (mctrl &TIOCM_CAR ) -return 1 ; -return 0 ; + +return mctrl &TIOCM_CAR ; }static void uart_dtr_rts (struct tty_port *port,int raise)
drivers/tty/synclink_gt.c +4 -3
@@ -3126,7 +3126,7 @@ static int tiocmset(struct tty_struct *tty,return 0 ; } -static int carrier_raised (struct tty_port *port) +static bool carrier_raised (struct tty_port *port) {unsigned long flags; struct slgt_info *info = container_of(port, struct slgt_info, port);
@@ -3134,7 +3134,8 @@ static int carrier_raised(struct tty_port *port)spin_lock_irqsave (&info->lock,flags);get_gtsignals (info);spin_unlock_irqrestore (&info->lock,flags); -return (info->signals & SerialSignal_DCD) ?1 :0 ; + +return info->signals & SerialSignal_DCD; }static void dtr_rts (struct tty_port *port,int on)
@@ -3162,7 +3163,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,int retval;bool do_clocal = false;unsigned long flags; -int cd; +bool cd;struct tty_port *port = &info->port;DBGINFO (("%s block_til_ready\n" , tty->driver->name));
drivers/tty/tty_port.c +2 -2
@@ -444,10 +444,10 @@ EXPORT_SYMBOL_GPL(tty_port_tty_wakeup);* to hide some internal details. This will eventually become entirely * internal to the tty port. */ -int tty_port_carrier_raised (struct tty_port *port) +bool tty_port_carrier_raised (struct tty_port *port) {if (port->ops->carrier_raised ==NULL ) -return 1 ; +return true;return port->ops->carrier_raised (port); }EXPORT_SYMBOL (tty_port_carrier_raised);
drivers/usb/serial/usb-serial.c +2 -2
@@ -754,7 +754,7 @@ static struct usb_serial_driver *search_serial_device(return NULL ; } -static int serial_port_carrier_raised (struct tty_port *port) +static bool serial_port_carrier_raised (struct tty_port *port) { struct usb_serial_port *p = container_of(port, struct usb_serial_port, port);struct usb_serial_driver *drv = p->serial->type;
@@ -762,7 +762,7 @@ static int serial_port_carrier_raised(struct tty_port *port)if (drv->carrier_raised)return drv->carrier_raised (p);/* No carrier control - don't block */ -return 1 ; +return true; }static void serial_port_dtr_rts (struct tty_port *port,int on)
include/linux/tty_port.h +3 -3
@@ -15,7 +15,7 @@ struct tty_struct;/** * struct tty_port_operations -- operations on tty_port -* @carrier_raised: return 1 if the carrier is raised on @port +* @carrier_raised: return true if the carrier is raised on @port * @dtr_rts: raise the DTR line if @raise is nonzero, otherwise lower DTR * @shutdown: called when the last close completes or a hangup finishes IFF the * port was initialized. Do not use to free resources. Turn off the device
@@ -31,7 +31,7 @@ struct tty_struct;* the port itself. */ struct tty_port_operations { -int (*carrier_raised)(struct tty_port *port); +bool (*carrier_raised)(struct tty_port *port);void (*dtr_rts)(struct tty_port *port,int raise);void (*shutdown)(struct tty_port *port);int (*activate)(struct tty_port *port,struct tty_struct *tty);
@@ -230,7 +230,7 @@ static inline void tty_port_set_kopened(struct tty_port *port, bool val)struct tty_struct *tty_port_tty_get (struct tty_port *port);void tty_port_tty_set (struct tty_port *port,struct tty_struct *tty); -int tty_port_carrier_raised (struct tty_port *port); +bool tty_port_carrier_raised (struct tty_port *port);void tty_port_raise_dtr_rts (struct tty_port *port);void tty_port_lower_dtr_rts (struct tty_port *port);void tty_port_hangup (struct tty_port *port);
net/bluetooth/rfcomm/tty.c +1 -1
@@ -119,7 +119,7 @@ static int rfcomm_dev_activate(struct tty_port *port, struct tty_struct *tty) }/* we block the open until the dlc->state becomes BT_CONNECTED */ -static int rfcomm_dev_carrier_raised (struct tty_port *port) +static bool rfcomm_dev_carrier_raised (struct tty_port *port) { struct rfcomm_dev *dev = container_of(port, struct rfcomm_dev, port);
Signature · 7 lines
2.30.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v4 7/12 tty: Convert ->dtr_rts() to take bool argument
In reply to Ilpo JärvinenConvert the raise/on parameter in ->dtr_rts() to bool through the callchain. The parameter is used like bool. In USB serial, there remains a few implicit bool -> larger type conversions because some devices use u8 in their control messages.
In moxa_tiocmget(), dtr variable was reused for line status which requires int so use a separate variable for status.
--- drivers/char/pcmcia/synclink_cs.c | 4 +-- drivers/mmc/core/sdio_uart.c | 4 +-- drivers/staging/greybus/uart.c | 2 +- drivers/tty/amiserial.c | 2 +- drivers/tty/hvc/hvc_console.c | 4 +-- drivers/tty/hvc/hvc_console.h | 2 +- drivers/tty/hvc/hvc_iucv.c | 4 +-- drivers/tty/moxa.c | 54 ++++++++++++++++--------------- drivers/tty/mxser.c | 2 +- drivers/tty/n_gsm.c | 2 +- drivers/tty/serial/serial_core.c | 8 ++--- drivers/tty/synclink_gt.c | 2 +- drivers/tty/tty_port.c | 4 +-- drivers/usb/class/cdc-acm.c | 2 +- drivers/usb/serial/usb-serial.c | 2 +- include/linux/tty_port.h | 4 +-- 16 files changed, 52 insertions(+), 50 deletions(-)
drivers/char/pcmcia/synclink_cs.c +2 -2
@@ -378,7 +378,7 @@ static void async_mode(MGSLPC_INFO *info);static void tx_timeout (struct timer_list *t);static bool carrier_raised (struct tty_port *port); -static void dtr_rts (struct tty_port *port,int onoff); +static void dtr_rts (struct tty_port *port,bool onoff);#if SYNCLINK_GENERIC_HDLC #define dev_to_port (D ) (dev_to_hdlc(D)->priv)
@@ -2442,7 +2442,7 @@ static bool carrier_raised(struct tty_port *port)return info->serial_signals & SerialSignal_DCD; } -static void dtr_rts (struct tty_port *port,int onoff) +static void dtr_rts (struct tty_port *port,bool onoff) {MGSLPC_INFO *info =container_of (port,MGSLPC_INFO , port);unsigned long flags;
drivers/mmc/core/sdio_uart.c +2 -2
@@ -548,14 +548,14 @@ static bool uart_carrier_raised(struct tty_port *tport)* adjusted during an open, close and hangup. */ -static void uart_dtr_rts (struct tty_port *tport,int onoff) +static void uart_dtr_rts (struct tty_port *tport,bool onoff) {struct sdio_uart_port *port = container_of(tport, struct sdio_uart_port, port);int ret =sdio_uart_claim_func (port);if (ret)return ; -if (onoff ==0 ) +if (!onoff)sdio_uart_clear_mctrl (port,TIOCM_DTR |TIOCM_RTS );else sdio_uart_set_mctrl (port,TIOCM_DTR |TIOCM_RTS );
drivers/staging/greybus/uart.c +1 -1
@@ -701,7 +701,7 @@ static int gb_tty_ioctl(struct tty_struct *tty, unsigned int cmd,return -ENOIOCTLCMD ; } -static void gb_tty_dtr_rts (struct tty_port *port,int on) +static void gb_tty_dtr_rts (struct tty_port *port,bool on) {struct gb_tty *gb_tty;u8 newctrl;
drivers/tty/amiserial.c +1 -1
@@ -1459,7 +1459,7 @@ static bool amiga_carrier_raised(struct tty_port *port)return !(ciab.pra &SER_DCD ); } -static void amiga_dtr_rts (struct tty_port *port,int raise) +static void amiga_dtr_rts (struct tty_port *port,bool raise) { struct serial_state *info = container_of(port, struct serial_state, tport);
drivers/tty/hvc/hvc_console.c +2 -2
@@ -376,7 +376,7 @@ static int hvc_open(struct tty_struct *tty, struct file * filp)/* We are ready... raise DTR/RTS */ if (C_BAUD (tty))if (hp->ops->dtr_rts) - hp->ops->dtr_rts (hp,1 ); + hp->ops->dtr_rts (hp, true);tty_port_set_initialized (&hp->port, true); }
@@ -406,7 +406,7 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)if (C_HUPCL (tty))if (hp->ops->dtr_rts) - hp->ops->dtr_rts (hp,0 ); + hp->ops->dtr_rts (hp, false);if (hp->ops->notifier_del) hp->ops->notifier_del (hp, hp->data);
drivers/tty/hvc/hvc_console.h +1 -1
@@ -66,7 +66,7 @@ struct hv_ops {int (*tiocmset)(struct hvc_struct *hp,unsigned int set,unsigned int clear);/* Callbacks to handle tty ports */ -void (*dtr_rts)(struct hvc_struct *hp,int raise); +void (*dtr_rts)(struct hvc_struct *hp,bool raise); };/* Register a vterm and a slot index for use as a console (console_init) */
drivers/tty/hvc/hvc_iucv.c +2 -2
@@ -658,13 +658,13 @@ static void hvc_iucv_notifier_hangup(struct hvc_struct *hp, int id)/** * hvc_iucv_dtr_rts() - HVC notifier for handling DTR/RTS * @hp: Pointer the HVC device (struct hvc_struct) -* @raise: Non-zero to raise or zero to lower DTR/RTS lines +* @raise: True to raise or false to lower DTR/RTS lines * * This routine notifies the HVC back-end to raise or lower DTR/RTS * lines. Raising DTR/RTS is ignored. Lowering DTR/RTS indicates to * drop the IUCV connection (similar to hang up the modem). */ -static void hvc_iucv_dtr_rts (struct hvc_struct *hp,int raise) +static void hvc_iucv_dtr_rts (struct hvc_struct *hp,bool raise) {struct hvc_iucv_private *priv;struct iucv_path *path;
drivers/tty/moxa.c +28 -26
136 lines not on this page · raw message
drivers/tty/mxser.c +1 -1
@@ -465,7 +465,7 @@ static bool mxser_carrier_raised(struct tty_port *port)return inb (mp->ioaddr +UART_MSR ) &UART_MSR_DCD ; } -static void mxser_dtr_rts (struct tty_port *port,int on) +static void mxser_dtr_rts (struct tty_port *port,bool on) { struct mxser_port *mp = container_of(port, struct mxser_port, port);unsigned long flags;
drivers/tty/n_gsm.c +1 -1
@@ -3792,7 +3792,7 @@ static bool gsm_carrier_raised(struct tty_port *port)return dlci->modem_rx &TIOCM_CD ; } -static void gsm_dtr_rts (struct tty_port *port,int onoff) +static void gsm_dtr_rts (struct tty_port *port,bool onoff) { struct gsm_dlci *dlci = container_of(port, struct gsm_dlci, port);unsigned int modem_tx = dlci->modem_tx;
drivers/tty/serial/serial_core.c +4 -4
@@ -169,7 +169,7 @@ uart_update_mctrl(struct uart_port *port, unsigned int set, unsigned int clear)#define uart_set_mctrl (port, set) uart_update_mctrl(port, set, 0)#define uart_clear_mctrl (port, clear) uart_update_mctrl(port, 0, clear) -static void uart_port_dtr_rts (struct uart_port *uport,int raise) +static void uart_port_dtr_rts (struct uart_port *uport,bool raise) {if (raise)uart_set_mctrl (uport,TIOCM_DTR |TIOCM_RTS );
@@ -239,7 +239,7 @@ static int uart_port_startup(struct tty_struct *tty, struct uart_state *state,* port is open and ready to respond. */ if (init_hw &&C_BAUD (tty)) -uart_port_dtr_rts (uport,1 ); +uart_port_dtr_rts (uport, true); }/*
@@ -302,7 +302,7 @@ static void uart_shutdown(struct tty_struct *tty, struct uart_state *state) }if (!tty ||C_HUPCL (tty)) -uart_port_dtr_rts (uport,0 ); +uart_port_dtr_rts (uport, false);uart_port_shutdown (port); }
@@ -1885,7 +1885,7 @@ static bool uart_carrier_raised(struct tty_port *port)return mctrl &TIOCM_CAR ; } -static void uart_dtr_rts (struct tty_port *port,int raise) +static void uart_dtr_rts (struct tty_port *port,bool raise) { struct uart_state *state = container_of(port, struct uart_state, port);struct uart_port *uport;
drivers/tty/synclink_gt.c +1 -1
@@ -3138,7 +3138,7 @@ static bool carrier_raised(struct tty_port *port)return info->signals & SerialSignal_DCD; } -static void dtr_rts (struct tty_port *port,int on) +static void dtr_rts (struct tty_port *port,bool on) {unsigned long flags; struct slgt_info *info = container_of(port, struct slgt_info, port);
drivers/tty/tty_port.c +2 -2
@@ -463,7 +463,7 @@ EXPORT_SYMBOL(tty_port_carrier_raised);void tty_port_raise_dtr_rts (struct tty_port *port) {if (port->ops->dtr_rts) - port->ops->dtr_rts (port,1 ); + port->ops->dtr_rts (port, true); }EXPORT_SYMBOL (tty_port_raise_dtr_rts);
@@ -478,7 +478,7 @@ EXPORT_SYMBOL(tty_port_raise_dtr_rts);void tty_port_lower_dtr_rts (struct tty_port *port) {if (port->ops->dtr_rts) - port->ops->dtr_rts (port,0 ); + port->ops->dtr_rts (port, false); }EXPORT_SYMBOL (tty_port_lower_dtr_rts);
drivers/usb/class/cdc-acm.c +1 -1
@@ -651,7 +651,7 @@ static int acm_tty_open(struct tty_struct *tty, struct file *filp)return tty_port_open (&acm->port, tty, filp); } -static void acm_port_dtr_rts (struct tty_port *port,int raise) +static void acm_port_dtr_rts (struct tty_port *port,bool raise) { struct acm *acm = container_of(port, struct acm, port);int val;
drivers/usb/serial/usb-serial.c +1 -1
@@ -765,7 +765,7 @@ static bool serial_port_carrier_raised(struct tty_port *port)return true; } -static void serial_port_dtr_rts (struct tty_port *port,int on) +static void serial_port_dtr_rts (struct tty_port *port,bool on) { struct usb_serial_port *p = container_of(port, struct usb_serial_port, port);struct usb_serial_driver *drv = p->serial->type;
include/linux/tty_port.h +2 -2
@@ -16,7 +16,7 @@ struct tty_struct;/** * struct tty_port_operations -- operations on tty_port * @carrier_raised: return true if the carrier is raised on @port -* @dtr_rts: raise the DTR line if @raise is nonzero, otherwise lower DTR +* @dtr_rts: raise the DTR line if @raise is true, otherwise lower DTR * @shutdown: called when the last close completes or a hangup finishes IFF the * port was initialized. Do not use to free resources. Turn off the device * only. Called under the port mutex to serialize against @activate and
@@ -32,7 +32,7 @@ struct tty_struct;*/ struct tty_port_operations {bool (*carrier_raised)(struct tty_port *port); -void (*dtr_rts)(struct tty_port *port,int raise); +void (*dtr_rts)(struct tty_port *port,bool raise);void (*shutdown)(struct tty_port *port);int (*activate)(struct tty_port *port,struct tty_struct *tty);void (*destruct)(struct tty_port *port);
Signature · 1 line
2.30.2
PATCH v4 8/12 tty/serial: Make ->dcd_change()+uart_handle_dcd_change() status bool active
In reply to Ilpo JärvinenConvert status parameter for ->dcd_change() and uart_handle_dcd_change() to bool which matches to how the parameter is used.
Rename status to active to better describe what the parameter means.
--- drivers/pps/clients/pps-ldisc.c | 6 +++--- drivers/tty/serial/serial_core.c | 8 ++++---- drivers/tty/serial/sunhv.c | 8 ++++---- include/linux/serial_core.h | 3 +-- include/linux/tty_ldisc.h | 4 ++-- 5 files changed, 14 insertions(+), 15 deletions(-)
drivers/pps/clients/pps-ldisc.c +3 -3
@@ -13,7 +13,7 @@#include <linux/pps_kernel.h> #include <linux/bug.h> -static void pps_tty_dcd_change (struct tty_struct *tty,unsigned int status) +static void pps_tty_dcd_change (struct tty_struct *tty,bool active) {struct pps_device *pps;struct pps_event_time ts;
@@ -29,11 +29,11 @@ static void pps_tty_dcd_change(struct tty_struct *tty, unsigned int status)return ;/* Now do the PPS event report */ -pps_event (pps, &ts, status ?PPS_CAPTUREASSERT : +pps_event (pps, &ts, active ?PPS_CAPTUREASSERT :PPS_CAPTURECLEAR ,NULL );dev_dbg (pps->dev,"PPS %s at %lu\n" , - status ?"assert" :"clear" , jiffies); + active ?"assert" :"clear" , jiffies); }static int (*alias_n_tty_open)(struct tty_struct *tty);
drivers/tty/serial/serial_core.c +4 -4
@@ -3252,11 +3252,11 @@ EXPORT_SYMBOL(uart_match_port);/** * uart_handle_dcd_change - handle a change of carrier detect state * @uport: uart_port structure for the open port -* @status: new carrier detect status, nonzero if active +* @active: new carrier detect status * * Caller must hold uport->lock. */ -void uart_handle_dcd_change (struct uart_port *uport,unsigned int status) +void uart_handle_dcd_change (struct uart_port *uport,bool active) {struct tty_port *port = &uport->state->port;struct tty_struct *tty = port->tty;
@@ -3268,7 +3268,7 @@ void uart_handle_dcd_change(struct uart_port *uport, unsigned int status) ld =tty_ldisc_ref (tty);if (ld) {if (ld->ops->dcd_change) - ld->ops->dcd_change (tty, status); + ld->ops->dcd_change (tty, active);tty_ldisc_deref (ld); } }
@@ -3276,7 +3276,7 @@ void uart_handle_dcd_change(struct uart_port *uport, unsigned int status) uport->icount.dcd++;if (uart_dcd_enabled (uport)) { -if (status) +if (active)wake_up_interruptible (&port->open_wait);else if (tty)tty_hangup (tty);
drivers/tty/serial/sunhv.c +4 -4
@@ -87,10 +87,10 @@ static int receive_chars_getchar(struct uart_port *port)if (c ==CON_HUP ) { hung_up =1 ; -uart_handle_dcd_change (port,0 ); +uart_handle_dcd_change (port, false); }else if (hung_up) { hung_up =0 ; -uart_handle_dcd_change (port,1 ); +uart_handle_dcd_change (port, true); }if (port->state ==NULL ) {
@@ -133,7 +133,7 @@ static int receive_chars_read(struct uart_port *port) bytes_read =1 ; }else if (stat ==CON_HUP ) { hung_up =1 ; -uart_handle_dcd_change (port,0 ); +uart_handle_dcd_change (port, false);continue ; }else {/* HV_EWOULDBLOCK, etc. */
@@ -143,7 +143,7 @@ static int receive_chars_read(struct uart_port *port)if (hung_up) { hung_up =0 ; -uart_handle_dcd_change (port,1 ); +uart_handle_dcd_change (port, true); }if (port->sysrq !=0 && *con_read_page) {
include/linux/serial_core.h +1 -2
@@ -896,8 +896,7 @@ static inline bool uart_softcts_mode(struct uart_port *uport)* The following are helper functions for the low level drivers. */ -extern void uart_handle_dcd_change (struct uart_port *uport, -unsigned int status); +extern void uart_handle_dcd_change (struct uart_port *uport,bool active);extern void uart_handle_cts_change (struct uart_port *uport,unsigned int status);
include/linux/tty_ldisc.h +2 -2
@@ -170,7 +170,7 @@ int ldsem_down_write_nested(struct ld_semaphore *sem, int subclass,* send, please arise a tasklet or workqueue to do the real data transfer. * Do not send data in this hook, it may lead to a deadlock. * -* @dcd_change: [DRV] ``void ()(struct tty_struct *tty, unsigned int status)`` +* @dcd_change: [DRV] ``void ()(struct tty_struct *tty, bool active)`` * * Tells the discipline that the DCD pin has changed its status. Used * exclusively by the %N_PPS (Pulse-Per-Second) line discipline.
@@ -238,7 +238,7 @@ struct tty_ldisc_ops {void (*receive_buf)(struct tty_struct *tty,const unsigned char *cp,const char *fp,int count);void (*write_wakeup)(struct tty_struct *tty); -void (*dcd_change)(struct tty_struct *tty,unsigned int status); +void (*dcd_change)(struct tty_struct *tty,bool active);int (*receive_buf2)(struct tty_struct *tty,const unsigned char *cp,const char *fp,int count); void (*lookahead_buf)(struct tty_struct *tty, const unsigned char *cp,
Signature · 1 line
2.30.2
PATCH v4 9/12 serial: Make uart_handle_cts_change() status param bool active
In reply to Ilpo JärvinenConvert uart_handle_cts_change() to bool which is more appropriate than unsigned int.
Rename status to active to better describe what the parameter means. While at it, make the comment about the active parameter easier to parse.
Cleanup callsites from operations that are not necessary with bool.
--- drivers/tty/serial/imx.c | 2 +- drivers/tty/serial/max3100.c | 2 +- drivers/tty/serial/max310x.c | 3 +-- drivers/tty/serial/serial_core.c | 8 ++++---- include/linux/serial_core.h | 3 +-- 5 files changed, 8 insertions(+), 10 deletions(-)
drivers/tty/serial/imx.c +1 -1
@@ -771,7 +771,7 @@ static irqreturn_t __imx_uart_rtsint(int irq, void *dev_id)imx_uart_writel (sport,USR1_RTSD ,USR1 ); usr1 =imx_uart_readl (sport,USR1 ) &USR1_RTSS ; -uart_handle_cts_change (&sport->port, !!usr1); +uart_handle_cts_change (&sport->port, usr1);wake_up_interruptible (&sport->port.state->port.delta_msr_wait);return IRQ_HANDLED ;
drivers/tty/serial/max3100.c +1 -1
@@ -247,7 +247,7 @@ static int max3100_handlerx(struct max3100_port *s, u16 rx) cts = (rx &MAX3100_CTS ) >0 ;if (s->cts != cts) { s->cts = cts; -uart_handle_cts_change (&s->port, cts ?TIOCM_CTS :0 ); +uart_handle_cts_change (&s->port, cts); }return ret;
drivers/tty/serial/max310x.c +1 -2
@@ -819,8 +819,7 @@ static irqreturn_t max310x_port_irq(struct max310x_port *s, int portno)if (ists &MAX310X_IRQ_CTS_BIT ) { lsr =max310x_port_read (port,MAX310X_LSR_IRQSTS_REG ); -uart_handle_cts_change (port, - !!(lsr &MAX310X_LSR_CTS_BIT )); +uart_handle_cts_change (port, lsr &MAX310X_LSR_CTS_BIT ); }if (rxlen)max310x_handle_rx (port, rxlen);
drivers/tty/serial/serial_core.c +4 -4
@@ -3287,11 +3287,11 @@ EXPORT_SYMBOL_GPL(uart_handle_dcd_change);/** * uart_handle_cts_change - handle a change of clear-to-send state * @uport: uart_port structure for the open port -* @status: new clear to send status, nonzero if active +* @active: new clear-to-send status * * Caller must hold uport->lock. */ -void uart_handle_cts_change (struct uart_port *uport,unsigned int status) +void uart_handle_cts_change (struct uart_port *uport,bool active) {lockdep_assert_held_once (&uport->lock);
@@ -3299,13 +3299,13 @@ void uart_handle_cts_change(struct uart_port *uport, unsigned int status)if (uart_softcts_mode (uport)) {if (uport->hw_stopped) { -if (status) { +if (active) { uport->hw_stopped =0 ; uport->ops->start_tx (uport);uart_write_wakeup (uport); } }else { -if (!status) { +if (!active) { uport->hw_stopped =1 ; uport->ops->stop_tx (uport); }
include/linux/serial_core.h +1 -2
@@ -897,8 +897,7 @@ static inline bool uart_softcts_mode(struct uart_port *uport)*/ extern void uart_handle_dcd_change (struct uart_port *uport,bool active); -extern void uart_handle_cts_change (struct uart_port *uport, -unsigned int status); +extern void uart_handle_cts_change (struct uart_port *uport,bool active);extern void uart_insert_char (struct uart_port *port,unsigned int status,unsigned int overrun,unsigned int ch,unsigned int flag);
Signature · 7 lines
2.30.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v4 10/12 tty: Return bool from tty_termios_hw_change()
In reply to Ilpo JärvinenChange tty_termios_hw_change() to return bool.
--- drivers/tty/tty_ioctl.c | 8 ++++---- include/linux/tty.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)
drivers/tty/tty_ioctl.c +4 -4
@@ -270,13 +270,13 @@ EXPORT_SYMBOL(tty_termios_copy_hw);* between the two termios structures, or a speed change is needed. */ -int tty_termios_hw_change (const struct ktermios *a,const struct ktermios *b) +bool tty_termios_hw_change (const struct ktermios *a,const struct ktermios *b) {if (a->c_ispeed != b->c_ispeed || a->c_ospeed != b->c_ospeed) -return 1 ; +return true;if ((a->c_cflag ^ b->c_cflag) & ~(HUPCL |CREAD |CLOCAL )) -return 1 ; -return 0 ; +return true; +return false; }EXPORT_SYMBOL (tty_termios_hw_change);
include/linux/tty.h +1 -1
@@ -453,7 +453,7 @@ unsigned char tty_get_char_size(unsigned int cflag);unsigned char tty_get_frame_size (unsigned int cflag);void tty_termios_copy_hw (struct ktermios *new,const struct ktermios *old); -int tty_termios_hw_change (const struct ktermios *a,const struct ktermios *b); +bool tty_termios_hw_change (const struct ktermios *a,const struct ktermios *b);int tty_set_termios (struct tty_struct *tty,struct ktermios *kt);void tty_wakeup (struct tty_struct *tty);
Signature · 1 line
2.30.2
PATCH v4 11/12 tty: Call ->dtr_rts() parameter active consistently
In reply to Ilpo JärvinenConvert various parameter names for ->dtr_rts() and related functions from onoff, on, and raise to active.
--- drivers/char/pcmcia/synclink_cs.c | 6 +++--- drivers/mmc/core/sdio_uart.c | 6 +++--- drivers/staging/greybus/uart.c | 4 ++-- drivers/tty/amiserial.c | 4 ++-- drivers/tty/hvc/hvc_console.h | 2 +- drivers/tty/hvc/hvc_iucv.c | 6 +++--- drivers/tty/mxser.c | 4 ++-- drivers/tty/n_gsm.c | 4 ++-- drivers/tty/serial/serial_core.c | 8 ++++---- drivers/tty/synclink_gt.c | 4 ++-- drivers/usb/class/cdc-acm.c | 4 ++-- include/linux/tty_port.h | 4 ++-- 12 files changed, 28 insertions(+), 28 deletions(-)
drivers/char/pcmcia/synclink_cs.c +3 -3
@@ -378,7 +378,7 @@ static void async_mode(MGSLPC_INFO *info);static void tx_timeout (struct timer_list *t);static bool carrier_raised (struct tty_port *port); -static void dtr_rts (struct tty_port *port,bool onoff); +static void dtr_rts (struct tty_port *port,bool active);#if SYNCLINK_GENERIC_HDLC #define dev_to_port (D ) (dev_to_hdlc(D)->priv)
@@ -2442,13 +2442,13 @@ static bool carrier_raised(struct tty_port *port)return info->serial_signals & SerialSignal_DCD; } -static void dtr_rts (struct tty_port *port,bool onoff) +static void dtr_rts (struct tty_port *port,bool active) {MGSLPC_INFO *info =container_of (port,MGSLPC_INFO , port);unsigned long flags;spin_lock_irqsave (&info->lock, flags); -if (onoff) +if (active) info->serial_signals |= SerialSignal_RTS | SerialSignal_DTR;else info->serial_signals &= ~(SerialSignal_RTS | SerialSignal_DTR);
drivers/mmc/core/sdio_uart.c +3 -3
@@ -542,20 +542,20 @@ static bool uart_carrier_raised(struct tty_port *tport)/** * uart_dtr_rts - port helper to set uart signals * @tport: tty port to be updated -* @onoff: set to turn on DTR/RTS +* @active: set to turn on DTR/RTS * * Called by the tty port helpers when the modem signals need to be * adjusted during an open, close and hangup. */ -static void uart_dtr_rts (struct tty_port *tport,bool onoff) +static void uart_dtr_rts (struct tty_port *tport,bool active) {struct sdio_uart_port *port = container_of(tport, struct sdio_uart_port, port);int ret =sdio_uart_claim_func (port);if (ret)return ; -if (!onoff) +if (!active)sdio_uart_clear_mctrl (port,TIOCM_DTR |TIOCM_RTS );else sdio_uart_set_mctrl (port,TIOCM_DTR |TIOCM_RTS );
drivers/staging/greybus/uart.c +2 -2
@@ -701,7 +701,7 @@ static int gb_tty_ioctl(struct tty_struct *tty, unsigned int cmd,return -ENOIOCTLCMD ; } -static void gb_tty_dtr_rts (struct tty_port *port,bool on) +static void gb_tty_dtr_rts (struct tty_port *port,bool active) {struct gb_tty *gb_tty;u8 newctrl;
@@ -709,7 +709,7 @@ static void gb_tty_dtr_rts(struct tty_port *port, bool on) gb_tty = container_of(port, struct gb_tty, port); newctrl = gb_tty->ctrlout; -if (on) +if (active) newctrl |= (GB_UART_CTRL_DTR |GB_UART_CTRL_RTS );else newctrl &= ~(GB_UART_CTRL_DTR |GB_UART_CTRL_RTS );
drivers/tty/amiserial.c +2 -2
@@ -1459,13 +1459,13 @@ static bool amiga_carrier_raised(struct tty_port *port)return !(ciab.pra &SER_DCD ); } -static void amiga_dtr_rts (struct tty_port *port,bool raise) +static void amiga_dtr_rts (struct tty_port *port,bool active) { struct serial_state *info = container_of(port, struct serial_state, tport);unsigned long flags; -if (raise) +if (active) info->MCR |=SER_DTR |SER_RTS ;else info->MCR &= ~(SER_DTR |SER_RTS );
drivers/tty/hvc/hvc_console.h +1 -1
@@ -66,7 +66,7 @@ struct hv_ops {int (*tiocmset)(struct hvc_struct *hp,unsigned int set,unsigned int clear);/* Callbacks to handle tty ports */ -void (*dtr_rts)(struct hvc_struct *hp,bool raise); +void (*dtr_rts)(struct hvc_struct *hp,bool active); };/* Register a vterm and a slot index for use as a console (console_init) */
drivers/tty/hvc/hvc_iucv.c +3 -3
@@ -658,13 +658,13 @@ static void hvc_iucv_notifier_hangup(struct hvc_struct *hp, int id)/** * hvc_iucv_dtr_rts() - HVC notifier for handling DTR/RTS * @hp: Pointer the HVC device (struct hvc_struct) -* @raise: True to raise or false to lower DTR/RTS lines +* @active: True to raise or false to lower DTR/RTS lines * * This routine notifies the HVC back-end to raise or lower DTR/RTS * lines. Raising DTR/RTS is ignored. Lowering DTR/RTS indicates to * drop the IUCV connection (similar to hang up the modem). */ -static void hvc_iucv_dtr_rts (struct hvc_struct *hp,bool raise) +static void hvc_iucv_dtr_rts (struct hvc_struct *hp,bool active) {struct hvc_iucv_private *priv;struct iucv_path *path;
@@ -672,7 +672,7 @@ static void hvc_iucv_dtr_rts(struct hvc_struct *hp, bool raise)/* Raising the DTR/RTS is ignored as IUCV connections can be * established at any times. */ -if (raise) +if (active)return ; priv =hvc_iucv_get_private (hp->vtermno);
drivers/tty/mxser.c +2 -2
@@ -465,7 +465,7 @@ static bool mxser_carrier_raised(struct tty_port *port)return inb (mp->ioaddr +UART_MSR ) &UART_MSR_DCD ; } -static void mxser_dtr_rts (struct tty_port *port,bool on) +static void mxser_dtr_rts (struct tty_port *port,bool active) { struct mxser_port *mp = container_of(port, struct mxser_port, port);unsigned long flags;
@@ -473,7 +473,7 @@ static void mxser_dtr_rts(struct tty_port *port, bool on)spin_lock_irqsave (&mp->slock, flags); mcr =inb (mp->ioaddr +UART_MCR ); -if (on) +if (active) mcr |=UART_MCR_DTR |UART_MCR_RTS ;else mcr &= ~(UART_MCR_DTR |UART_MCR_RTS );
drivers/tty/n_gsm.c +2 -2
@@ -3792,11 +3792,11 @@ static bool gsm_carrier_raised(struct tty_port *port)return dlci->modem_rx &TIOCM_CD ; } -static void gsm_dtr_rts (struct tty_port *port,bool onoff) +static void gsm_dtr_rts (struct tty_port *port,bool active) { struct gsm_dlci *dlci = container_of(port, struct gsm_dlci, port);unsigned int modem_tx = dlci->modem_tx; -if (onoff) +if (active) modem_tx |=TIOCM_DTR |TIOCM_RTS ;else modem_tx &= ~(TIOCM_DTR |TIOCM_RTS );
drivers/tty/serial/serial_core.c +4 -4
@@ -169,9 +169,9 @@ uart_update_mctrl(struct uart_port *port, unsigned int set, unsigned int clear)#define uart_set_mctrl (port, set) uart_update_mctrl(port, set, 0)#define uart_clear_mctrl (port, clear) uart_update_mctrl(port, 0, clear) -static void uart_port_dtr_rts (struct uart_port *uport,bool raise) +static void uart_port_dtr_rts (struct uart_port *uport,bool active) { -if (raise) +if (active)uart_set_mctrl (uport,TIOCM_DTR |TIOCM_RTS );else uart_clear_mctrl (uport,TIOCM_DTR |TIOCM_RTS );
@@ -1885,7 +1885,7 @@ static bool uart_carrier_raised(struct tty_port *port)return mctrl &TIOCM_CAR ; } -static void uart_dtr_rts (struct tty_port *port,bool raise) +static void uart_dtr_rts (struct tty_port *port,bool active) { struct uart_state *state = container_of(port, struct uart_state, port);struct uart_port *uport;
@@ -1893,7 +1893,7 @@ static void uart_dtr_rts(struct tty_port *port, bool raise) uport =uart_port_ref (state);if (!uport)return ; -uart_port_dtr_rts (uport, raise); +uart_port_dtr_rts (uport, active);uart_port_deref (uport); }
drivers/tty/synclink_gt.c +2 -2
@@ -3138,13 +3138,13 @@ static bool carrier_raised(struct tty_port *port)return info->signals & SerialSignal_DCD; } -static void dtr_rts (struct tty_port *port,bool on) +static void dtr_rts (struct tty_port *port,bool active) {unsigned long flags; struct slgt_info *info = container_of(port, struct slgt_info, port);spin_lock_irqsave (&info->lock,flags); -if (on) +if (active) info->signals |= SerialSignal_RTS | SerialSignal_DTR;else info->signals &= ~(SerialSignal_RTS | SerialSignal_DTR);
drivers/usb/class/cdc-acm.c +2 -2
@@ -651,13 +651,13 @@ static int acm_tty_open(struct tty_struct *tty, struct file *filp)return tty_port_open (&acm->port, tty, filp); } -static void acm_port_dtr_rts (struct tty_port *port,bool raise) +static void acm_port_dtr_rts (struct tty_port *port,bool active) { struct acm *acm = container_of(port, struct acm, port);int val;int res; -if (raise) +if (active) val =USB_CDC_CTRL_DTR |USB_CDC_CTRL_RTS ;else val =0 ;
include/linux/tty_port.h +2 -2
@@ -16,7 +16,7 @@ struct tty_struct;/** * struct tty_port_operations -- operations on tty_port * @carrier_raised: return true if the carrier is raised on @port -* @dtr_rts: raise the DTR line if @raise is true, otherwise lower DTR +* @dtr_rts: raise the DTR line if @active is true, otherwise lower DTR * @shutdown: called when the last close completes or a hangup finishes IFF the * port was initialized. Do not use to free resources. Turn off the device * only. Called under the port mutex to serialize against @activate and
@@ -32,7 +32,7 @@ struct tty_struct;*/ struct tty_port_operations {bool (*carrier_raised)(struct tty_port *port); -void (*dtr_rts)(struct tty_port *port,bool raise); +void (*dtr_rts)(struct tty_port *port,bool active);void (*shutdown)(struct tty_port *port);int (*activate)(struct tty_port *port,struct tty_struct *tty);void (*destruct)(struct tty_port *port);
Signature · 1 line
2.30.2
PATCH v4 12/12 tty: moxa: Rename dtr/rts parameters/variables to active
In reply to Ilpo JärvinenUse active consistently for naming parameters and variables.
--- drivers/tty/moxa.c | 52 +++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 26 deletions(-)
drivers/tty/moxa.c +26 -26
@@ -1443,10 +1443,10 @@ static bool moxa_carrier_raised(struct tty_port *port)return dcd; } -static void moxa_dtr_rts (struct tty_port *port,bool onoff) +static void moxa_dtr_rts (struct tty_port *port,bool active) { struct moxa_port *ch = container_of(port, struct moxa_port, port); -MoxaPortLineCtrl (ch, onoff, onoff); +MoxaPortLineCtrl (ch, active, active); }
@@ -1557,14 +1557,14 @@ static unsigned int moxa_chars_in_buffer(struct tty_struct *tty)static int moxa_tiocmget (struct tty_struct *tty) {struct moxa_port *ch = tty->driver_data; -bool dtr, rts; +bool dtr_active, rts_active;int flag =0 ;int status; -MoxaPortGetLineOut (ch, &dtr, &rts); -if (dtr) +MoxaPortGetLineOut (ch, &dtr_active, &rts_active); +if (dtr_active) flag |=TIOCM_DTR ; -if (rts) +if (rts_active) flag |=TIOCM_RTS ; status =MoxaPortLineStatus (ch);if (status &1 )
@@ -1579,8 +1579,8 @@ static int moxa_tiocmget(struct tty_struct *tty)static int moxa_tiocmset (struct tty_struct *tty,unsigned int set,unsigned int clear) { +bool dtr_active, rts_active;struct moxa_port *ch; -bool dtr, rts;mutex_lock (&moxa_openlock); ch = tty->driver_data;
@@ -1589,16 +1589,16 @@ static int moxa_tiocmset(struct tty_struct *tty,return -EINVAL ; } -MoxaPortGetLineOut (ch, &dtr, &rts); +MoxaPortGetLineOut (ch, &dtr_active, &rts_active);if (set &TIOCM_RTS ) - rts = true; + rts_active = true;if (set &TIOCM_DTR ) - dtr = true; + dtr_active = true;if (clear &TIOCM_RTS ) - rts = false; + rts_active = false;if (clear &TIOCM_DTR ) - dtr = false; -MoxaPortLineCtrl (ch, dtr, rts); + dtr_active = false; +MoxaPortLineCtrl (ch, dtr_active, rts_active);mutex_unlock (&moxa_openlock);return 0 ; }
@@ -1881,10 +1881,10 @@ static void MoxaPortFlushData(struct moxa_port *port, int mode)* Syntax: * int MoxaPortGetLineOut(int port, bool *dtrState, bool *rtsState); * int port : port number (0 - 127) -* bool * dtrState : pointer to bool to receive the current DTR +* bool * dtr_active : pointer to bool to receive the current DTR * state. (if NULL, this function will not * write to this address) -* bool * rtsState : pointer to bool to receive the current RTS +* bool * rts_active : pointer to bool to receive the current RTS * state. (if NULL, this function will not * write to this address) *
@@ -1896,8 +1896,8 @@ static void MoxaPortFlushData(struct moxa_port *port, int mode)* Syntax: * void MoxaPortLineCtrl(int port, bool dtrState, bool rtsState); * int port : port number (0 - 127) -* bool dtrState : DTR output state -* bool rtsState : RTS output state +* bool dtr_active : DTR output state +* bool rts_active : RTS output state * * * Function 15: Setting the flow control of this port.
@@ -2105,24 +2105,24 @@ static int MoxaPortSetTermio(struct moxa_port *port, struct ktermios *termio,return baud; } -static int MoxaPortGetLineOut (struct moxa_port *port,bool *dtrState, -bool *rtsState) +static int MoxaPortGetLineOut (struct moxa_port *port,bool *dtr_active, +bool *rts_active) { -if (dtrState) - *dtrState = port->lineCtrl &DTR_ON ; -if (rtsState) - *rtsState = port->lineCtrl &RTS_ON ; +if (dtr_active) + *dtr_active = port->lineCtrl &DTR_ON ; +if (rts_active) + *rts_active = port->lineCtrl &RTS_ON ;return 0 ; } -static void MoxaPortLineCtrl (struct moxa_port *port,bool dtr,bool rts) +static void MoxaPortLineCtrl (struct moxa_port *port,bool dtr_active,bool rts_active) {u8 mode =0 ; -if (dtr) +if (dtr_active) mode |=DTR_ON ; -if (rts) +if (rts_active) mode |=RTS_ON ; port->lineCtrl = mode;moxafunc (port->tableAddr, FC_LineControl, mode);
Signature · 1 line
2.30.2