Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc242fc1 authored by Johan Hovold's avatar Johan Hovold
Browse files

USB: serial: drop termios-flag debugging 



Drop some unnecessary termios-flag debugging that have been faithfully
reproduced in a few old drivers, including the "clfag" typo and all.

This also addresses a compiler warning on sparc where tcflag_t is
unsigned long and would have required an explicit cast.

Reported-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Reviewed-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
parent d5ccfce0

drivers/usb/serial/io_edgeport.c

+0 −5
Original line number Diff line number Diff line
@@ -1544,11 +1544,6 @@ static void edge_set_termios(struct tty_struct *tty, 
	struct usb_serial_port *port, struct ktermios *old_termios)

{

	struct edgeport_port *edge_port = usb_get_serial_port_data(port);

	unsigned int cflag;



	cflag = tty->termios.c_cflag;

	dev_dbg(&port->dev, "%s - clfag %08x iflag %08x\n", __func__, tty->termios.c_cflag, tty->termios.c_iflag);

	dev_dbg(&port->dev, "%s - old clfag %08x old iflag %08x\n", __func__, old_termios->c_cflag, old_termios->c_iflag);



	if (edge_port == NULL)

		return;

drivers/usb/serial/io_ti.c

+0 −8
Original line number Diff line number Diff line
@@ -2372,14 +2372,6 @@ static void edge_set_termios(struct tty_struct *tty, 
		struct usb_serial_port *port, struct ktermios *old_termios)

{

	struct edgeport_port *edge_port = usb_get_serial_port_data(port);

	unsigned int cflag;



	cflag = tty->termios.c_cflag;



	dev_dbg(&port->dev, "%s - clfag %08x iflag %08x\n", __func__,

		tty->termios.c_cflag, tty->termios.c_iflag);

	dev_dbg(&port->dev, "%s - old clfag %08x old iflag %08x\n", __func__,

		old_termios->c_cflag, old_termios->c_iflag);



	if (edge_port == NULL)

		return;

drivers/usb/serial/mos7720.c

+0 −11
Original line number Diff line number Diff line
@@ -1688,7 +1688,6 @@ static void mos7720_set_termios(struct tty_struct *tty, 
		struct usb_serial_port *port, struct ktermios *old_termios)

{

	int status;

	unsigned int cflag;

	struct usb_serial *serial;

	struct moschip_port *mos7720_port;
@@ -1704,16 +1703,6 @@ static void mos7720_set_termios(struct tty_struct *tty, 
		return;

	}



	dev_dbg(&port->dev, "setting termios - ASPIRE\n");



	cflag = tty->termios.c_cflag;



	dev_dbg(&port->dev, "%s - cflag %08x iflag %08x\n", __func__,

		tty->termios.c_cflag, RELEVANT_IFLAG(tty->termios.c_iflag));



	dev_dbg(&port->dev, "%s - old cflag %08x old iflag %08x\n", __func__,

		old_termios->c_cflag, RELEVANT_IFLAG(old_termios->c_iflag));



	/* change the port settings to the new ones specified */

	change_port_settings(tty, mos7720_port, old_termios);

drivers/usb/serial/mos7840.c

+0 −10
Original line number Diff line number Diff line
@@ -1868,7 +1868,6 @@ static void mos7840_set_termios(struct tty_struct *tty, 
				struct ktermios *old_termios)

{

	int status;

	unsigned int cflag;

	struct usb_serial *serial;

	struct moschip_port *mos7840_port;
@@ -1890,15 +1889,6 @@ static void mos7840_set_termios(struct tty_struct *tty, 
		return;

	}



	dev_dbg(&port->dev, "%s", "setting termios - \n");



	cflag = tty->termios.c_cflag;



	dev_dbg(&port->dev, "%s - clfag %08x iflag %08x\n", __func__,

		tty->termios.c_cflag, RELEVANT_IFLAG(tty->termios.c_iflag));

	dev_dbg(&port->dev, "%s - old clfag %08x old iflag %08x\n", __func__,

		old_termios->c_cflag, RELEVANT_IFLAG(old_termios->c_iflag));



	/* change the port settings to the new ones specified */



	mos7840_change_port_settings(tty, mos7840_port, old_termios);

drivers/usb/serial/ti_usb_3410_5052.c

+0 −8
Original line number Diff line number Diff line
@@ -929,7 +929,6 @@ static void ti_set_termios(struct tty_struct *tty, 
{

	struct ti_port *tport = usb_get_serial_port_data(port);

	struct ti_uart_config *config;

	tcflag_t cflag, iflag;

	int baud;

	int status;

	int port_number = port->port_number;
@@ -937,13 +936,6 @@ static void ti_set_termios(struct tty_struct *tty, 
	u16 wbaudrate;

	u16 wflags = 0;



	cflag = tty->termios.c_cflag;

	iflag = tty->termios.c_iflag;



	dev_dbg(&port->dev, "%s - cflag %08x, iflag %08x\n", __func__, cflag, iflag);

	dev_dbg(&port->dev, "%s - old clfag %08x, old iflag %08x\n", __func__,

		old_termios->c_cflag, old_termios->c_iflag);



	config = kmalloc(sizeof(*config), GFP_KERNEL);

	if (!config)

		return;