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

Commit 4d5147ec authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

USB: serial: clean up ioctl debugging 



Remove redundant ioctl debugging from subdrivers. The ioctl request code
has already been logged by usb-serial core.

Signed-off-by: default avatarJohan Hovold <jhovold@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5c6b98dd

drivers/usb/serial/f81232.c

+0 −4
Original line number Diff line number Diff line
@@ -287,8 +287,6 @@ static int f81232_ioctl(struct tty_struct *tty, 
	struct serial_struct ser;

	struct usb_serial_port *port = tty->driver_data;



	dev_dbg(&port->dev, "%s cmd = 0x%04x\n", __func__, cmd);



	switch (cmd) {

	case TIOCGSERIAL:

		memset(&ser, 0, sizeof ser);
@@ -302,8 +300,6 @@ static int f81232_ioctl(struct tty_struct *tty, 


		return 0;

	default:

		dev_dbg(&port->dev, "%s not supported = 0x%04x\n",

			__func__, cmd);

		break;

	}

	return -ENOIOCTLCMD;

drivers/usb/serial/ftdi_sio.c

+1 −7
Original line number Diff line number Diff line
@@ -2383,8 +2383,6 @@ static int ftdi_ioctl(struct tty_struct *tty, 
{

	struct usb_serial_port *port = tty->driver_data;



	dev_dbg(&port->dev, "%s cmd 0x%04x\n", __func__, cmd);



	/* Based on code from acm.c and others */

	switch (cmd) {
@@ -2401,11 +2399,7 @@ static int ftdi_ioctl(struct tty_struct *tty, 
	default:

		break;

	}

	/* This is not necessarily an error - turns out the higher layers

	 * will do some ioctls themselves (see comment above)

	 */

	dev_dbg(&port->dev, "%s arg not supported - it was 0x%04x - check /usr/include/asm/ioctls.h\n",

		__func__, cmd);



	return -ENOIOCTLCMD;

}

drivers/usb/serial/io_edgeport.c

+0 −2
Original line number Diff line number Diff line
@@ -1593,8 +1593,6 @@ static int edge_ioctl(struct tty_struct *tty, 
	DEFINE_WAIT(wait);

	struct edgeport_port *edge_port = usb_get_serial_port_data(port);



	dev_dbg(&port->dev, "%s - cmd = 0x%x\n", __func__, cmd);



	switch (cmd) {

	case TIOCSERGETLSR:

		dev_dbg(&port->dev, "%s TIOCSERGETLSR\n", __func__);

drivers/usb/serial/io_ti.c

+0 −2
Original line number Diff line number Diff line
@@ -2362,8 +2362,6 @@ static int edge_ioctl(struct tty_struct *tty, 
	struct usb_serial_port *port = tty->driver_data;

	struct edgeport_port *edge_port = usb_get_serial_port_data(port);



	dev_dbg(&port->dev, "%s - cmd = 0x%x\n", __func__, cmd);



	switch (cmd) {

	case TIOCGSERIAL:

		dev_dbg(&port->dev, "%s - TIOCGSERIAL\n", __func__);

drivers/usb/serial/mos7720.c

+0 −2
Original line number Diff line number Diff line
@@ -1885,8 +1885,6 @@ static int mos7720_ioctl(struct tty_struct *tty, 
	if (mos7720_port == NULL)

		return -ENODEV;



	dev_dbg(&port->dev, "%s - cmd = 0x%x", __func__, cmd);



	switch (cmd) {

	case TIOCSERGETLSR:

		dev_dbg(&port->dev, "%s TIOCSERGETLSR\n", __func__);