Re: [PATCH v3 07/13] tty: Convert ->dtr_rts() to take bool argument
On Wed, 11 Jan 2023 at 15:24, Ilpo Järvinen wrote: > > Convert 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. > > Reviewed-by: Jiri Slaby > Signed-off-by: Ilpo Järvinen Acked-by: Ulf Hansson # For MMC Kind regards Uffe > --- > 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/ch341.c | 2 +- > drivers/usb/serial/cp210x.c | 4 +-- > drivers/usb/serial/cypress_m8.c | 6 ++-- > drivers/usb/serial/digi_acceleport.c | 6 ++-- > drivers/usb/serial/f81232.c | 2 +- > drivers/usb/serial/f81534.c | 2 +- > drivers/usb/serial/ftdi_sio.c| 2 +- > drivers/usb/serial/ipw.c | 2 +- > drivers/usb/serial/keyspan.c | 2 +- > drivers/usb/serial/keyspan_pda.c | 2 +- > drivers/usb/serial/mct_u232.c| 4 +-- > drivers/usb/serial/mxuport.c | 2 +- > drivers/usb/serial/pl2303.c | 2 +- > drivers/usb/serial/quatech2.c| 2 +- > drivers/usb/serial/sierra.c | 2 +- > drivers/usb/serial/spcp8x5.c | 2 +- > drivers/usb/serial/ssu100.c | 2 +- > drivers/usb/serial/upd78f0730.c | 6 ++-- > drivers/usb/serial/usb-serial.c | 2 +- > drivers/usb/serial/usb-wwan.h| 2 +- > drivers/usb/serial/usb_wwan.c| 2 +- > drivers/usb/serial/xr_serial.c | 6 ++-- > include/linux/tty_port.h | 4 +-- > include/linux/usb/serial.h | 2 +- > 38 files changed, 84 insertions(+), 82 deletions(-) > > diff --git a/drivers/char/pcmcia/synclink_cs.c > b/drivers/char/pcmcia/synclink_cs.c > index 4391138e1b8a..46a0b586d234 100644 > --- a/drivers/char/pcmcia/synclink_cs.c > +++ b/drivers/char/pcmcia/synclink_cs.c > @@ -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; > diff --git a/drivers/mmc/core/sdio_uart.c b/drivers/mmc/core/sdio_uart.c > index 47f58258d8ff..c6b4b2b2a4b2 100644 > --- a/drivers/mmc/core/sdio_uart.c > +++ b/drivers/mmc/core/sdio_uart.c > @@ -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); > diff --git a/drivers/staging/greybus/uart.c b/drivers/staging/greybus/uart.c > index 90ff07f2cbf7..92d49740d5a4 100644 > --- a/drivers/staging/greybus/uart.c > +++ b/drivers/staging/greybus/uart.c > @@ -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; > diff --git a/drivers/tty/amiserial.c b/drivers/tty/amiserial.c > index 01c4fd3ce7c8..29d4c554f6b8 100644 > --- a/drivers/tty/amiserial.c > +++ b/drivers/tty/amiserial.c > @@ -1459,7 +1459,7 @@
Re: [PATCH v3 07/13] tty: Convert ->dtr_rts() to take bool argument
On Wed, Jan 11, 2023 at 04:23:25PM +0200, Ilpo Järvinen wrote: > Convert 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. > > Reviewed-by: Jiri Slaby > Signed-off-by: Ilpo Järvinen > --- > 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/ch341.c | 2 +- > drivers/usb/serial/cp210x.c | 4 +-- > drivers/usb/serial/cypress_m8.c | 6 ++-- > drivers/usb/serial/digi_acceleport.c | 6 ++-- > drivers/usb/serial/f81232.c | 2 +- > drivers/usb/serial/f81534.c | 2 +- > drivers/usb/serial/ftdi_sio.c| 2 +- > drivers/usb/serial/ipw.c | 2 +- > drivers/usb/serial/keyspan.c | 2 +- > drivers/usb/serial/keyspan_pda.c | 2 +- > drivers/usb/serial/mct_u232.c| 4 +-- > drivers/usb/serial/mxuport.c | 2 +- > drivers/usb/serial/pl2303.c | 2 +- > drivers/usb/serial/quatech2.c| 2 +- > drivers/usb/serial/sierra.c | 2 +- > drivers/usb/serial/spcp8x5.c | 2 +- > drivers/usb/serial/ssu100.c | 2 +- > drivers/usb/serial/upd78f0730.c | 6 ++-- > drivers/usb/serial/usb-serial.c | 2 +- > drivers/usb/serial/usb-wwan.h| 2 +- > drivers/usb/serial/usb_wwan.c| 2 +- > drivers/usb/serial/xr_serial.c | 6 ++-- > include/linux/tty_port.h | 4 +-- > include/linux/usb/serial.h | 2 +- > 38 files changed, 84 insertions(+), 82 deletions(-) Same here. No need to lump the tty-port changes with USB-serial changes. Johan
[PATCH v3 07/13] tty: Convert ->dtr_rts() to take bool argument
Convert 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. Reviewed-by: Jiri Slaby Signed-off-by: Ilpo Järvinen --- 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/ch341.c | 2 +- drivers/usb/serial/cp210x.c | 4 +-- drivers/usb/serial/cypress_m8.c | 6 ++-- drivers/usb/serial/digi_acceleport.c | 6 ++-- drivers/usb/serial/f81232.c | 2 +- drivers/usb/serial/f81534.c | 2 +- drivers/usb/serial/ftdi_sio.c| 2 +- drivers/usb/serial/ipw.c | 2 +- drivers/usb/serial/keyspan.c | 2 +- drivers/usb/serial/keyspan_pda.c | 2 +- drivers/usb/serial/mct_u232.c| 4 +-- drivers/usb/serial/mxuport.c | 2 +- drivers/usb/serial/pl2303.c | 2 +- drivers/usb/serial/quatech2.c| 2 +- drivers/usb/serial/sierra.c | 2 +- drivers/usb/serial/spcp8x5.c | 2 +- drivers/usb/serial/ssu100.c | 2 +- drivers/usb/serial/upd78f0730.c | 6 ++-- drivers/usb/serial/usb-serial.c | 2 +- drivers/usb/serial/usb-wwan.h| 2 +- drivers/usb/serial/usb_wwan.c| 2 +- drivers/usb/serial/xr_serial.c | 6 ++-- include/linux/tty_port.h | 4 +-- include/linux/usb/serial.h | 2 +- 38 files changed, 84 insertions(+), 82 deletions(-) diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c index 4391138e1b8a..46a0b586d234 100644 --- a/drivers/char/pcmcia/synclink_cs.c +++ b/drivers/char/pcmcia/synclink_cs.c @@ -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; diff --git a/drivers/mmc/core/sdio_uart.c b/drivers/mmc/core/sdio_uart.c index 47f58258d8ff..c6b4b2b2a4b2 100644 --- a/drivers/mmc/core/sdio_uart.c +++ b/drivers/mmc/core/sdio_uart.c @@ -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); diff --git a/drivers/staging/greybus/uart.c b/drivers/staging/greybus/uart.c index 90ff07f2cbf7..92d49740d5a4 100644 --- a/drivers/staging/greybus/uart.c +++ b/drivers/staging/greybus/uart.c @@ -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; diff --git a/drivers/tty/amiserial.c b/drivers/tty/amiserial.c index 01c4fd3ce7c8..29d4c554f6b8 100644 --- a/drivers/tty/amiserial.c +++ b/drivers/tty/amiserial.c @@ -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,