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

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
...@@ -287,8 +287,6 @@ static int f81232_ioctl(struct tty_struct *tty, ...@@ -287,8 +287,6 @@ static int f81232_ioctl(struct tty_struct *tty,
struct serial_struct ser; struct serial_struct ser;
struct usb_serial_port *port = tty->driver_data; struct usb_serial_port *port = tty->driver_data;
dev_dbg(&port->dev, "%s cmd = 0x%04x\n", __func__, cmd);
switch (cmd) { switch (cmd) {
case TIOCGSERIAL: case TIOCGSERIAL:
memset(&ser, 0, sizeof ser); memset(&ser, 0, sizeof ser);
...@@ -302,8 +300,6 @@ static int f81232_ioctl(struct tty_struct *tty, ...@@ -302,8 +300,6 @@ static int f81232_ioctl(struct tty_struct *tty,
return 0; return 0;
default: default:
dev_dbg(&port->dev, "%s not supported = 0x%04x\n",
__func__, cmd);
break; break;
} }
return -ENOIOCTLCMD; return -ENOIOCTLCMD;
......
...@@ -2383,8 +2383,6 @@ static int ftdi_ioctl(struct tty_struct *tty, ...@@ -2383,8 +2383,6 @@ static int ftdi_ioctl(struct tty_struct *tty,
{ {
struct usb_serial_port *port = tty->driver_data; 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 */ /* Based on code from acm.c and others */
switch (cmd) { switch (cmd) {
...@@ -2401,11 +2399,7 @@ static int ftdi_ioctl(struct tty_struct *tty, ...@@ -2401,11 +2399,7 @@ static int ftdi_ioctl(struct tty_struct *tty,
default: default:
break; 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; return -ENOIOCTLCMD;
} }
......
...@@ -1593,8 +1593,6 @@ static int edge_ioctl(struct tty_struct *tty, ...@@ -1593,8 +1593,6 @@ static int edge_ioctl(struct tty_struct *tty,
DEFINE_WAIT(wait); DEFINE_WAIT(wait);
struct edgeport_port *edge_port = usb_get_serial_port_data(port); struct edgeport_port *edge_port = usb_get_serial_port_data(port);
dev_dbg(&port->dev, "%s - cmd = 0x%x\n", __func__, cmd);
switch (cmd) { switch (cmd) {
case TIOCSERGETLSR: case TIOCSERGETLSR:
dev_dbg(&port->dev, "%s TIOCSERGETLSR\n", __func__); dev_dbg(&port->dev, "%s TIOCSERGETLSR\n", __func__);
......
...@@ -2362,8 +2362,6 @@ static int edge_ioctl(struct tty_struct *tty, ...@@ -2362,8 +2362,6 @@ static int edge_ioctl(struct tty_struct *tty,
struct usb_serial_port *port = tty->driver_data; struct usb_serial_port *port = tty->driver_data;
struct edgeport_port *edge_port = usb_get_serial_port_data(port); struct edgeport_port *edge_port = usb_get_serial_port_data(port);
dev_dbg(&port->dev, "%s - cmd = 0x%x\n", __func__, cmd);
switch (cmd) { switch (cmd) {
case TIOCGSERIAL: case TIOCGSERIAL:
dev_dbg(&port->dev, "%s - TIOCGSERIAL\n", __func__); dev_dbg(&port->dev, "%s - TIOCGSERIAL\n", __func__);
......
...@@ -1885,8 +1885,6 @@ static int mos7720_ioctl(struct tty_struct *tty, ...@@ -1885,8 +1885,6 @@ static int mos7720_ioctl(struct tty_struct *tty,
if (mos7720_port == NULL) if (mos7720_port == NULL)
return -ENODEV; return -ENODEV;
dev_dbg(&port->dev, "%s - cmd = 0x%x", __func__, cmd);
switch (cmd) { switch (cmd) {
case TIOCSERGETLSR: case TIOCSERGETLSR:
dev_dbg(&port->dev, "%s TIOCSERGETLSR\n", __func__); dev_dbg(&port->dev, "%s TIOCSERGETLSR\n", __func__);
......
...@@ -2070,8 +2070,6 @@ static int mos7840_ioctl(struct tty_struct *tty, ...@@ -2070,8 +2070,6 @@ static int mos7840_ioctl(struct tty_struct *tty,
if (mos7840_port == NULL) if (mos7840_port == NULL)
return -1; return -1;
dev_dbg(&port->dev, "%s - cmd = 0x%x\n", __func__, cmd);
switch (cmd) { switch (cmd) {
/* return number of bytes available */ /* return number of bytes available */
......
...@@ -367,8 +367,6 @@ static int opticon_ioctl(struct tty_struct *tty, ...@@ -367,8 +367,6 @@ static int opticon_ioctl(struct tty_struct *tty,
{ {
struct usb_serial_port *port = tty->driver_data; struct usb_serial_port *port = tty->driver_data;
dev_dbg(&port->dev, "%s - cmd = 0x%x\n", __func__, cmd);
switch (cmd) { switch (cmd) {
case TIOCGSERIAL: case TIOCGSERIAL:
return get_serial_info(port, return get_serial_info(port,
......
...@@ -648,8 +648,6 @@ static int pl2303_ioctl(struct tty_struct *tty, ...@@ -648,8 +648,6 @@ static int pl2303_ioctl(struct tty_struct *tty,
struct serial_struct ser; struct serial_struct ser;
struct usb_serial_port *port = tty->driver_data; struct usb_serial_port *port = tty->driver_data;
dev_dbg(&port->dev, "%s cmd = 0x%04x\n", __func__, cmd);
switch (cmd) { switch (cmd) {
case TIOCGSERIAL: case TIOCGSERIAL:
memset(&ser, 0, sizeof ser); memset(&ser, 0, sizeof ser);
...@@ -663,7 +661,6 @@ static int pl2303_ioctl(struct tty_struct *tty, ...@@ -663,7 +661,6 @@ static int pl2303_ioctl(struct tty_struct *tty,
return 0; return 0;
default: default:
dev_dbg(&port->dev, "%s not supported = 0x%04x\n", __func__, cmd);
break; break;
} }
return -ENOIOCTLCMD; return -ENOIOCTLCMD;
......
...@@ -342,8 +342,6 @@ static int ssu100_ioctl(struct tty_struct *tty, ...@@ -342,8 +342,6 @@ static int ssu100_ioctl(struct tty_struct *tty,
{ {
struct usb_serial_port *port = tty->driver_data; struct usb_serial_port *port = tty->driver_data;
dev_dbg(&port->dev, "%s cmd 0x%04x\n", __func__, cmd);
switch (cmd) { switch (cmd) {
case TIOCGSERIAL: case TIOCGSERIAL:
return get_serial_info(port, return get_serial_info(port,
...@@ -352,8 +350,6 @@ static int ssu100_ioctl(struct tty_struct *tty, ...@@ -352,8 +350,6 @@ static int ssu100_ioctl(struct tty_struct *tty,
break; break;
} }
dev_dbg(&port->dev, "%s arg not supported\n", __func__);
return -ENOIOCTLCMD; return -ENOIOCTLCMD;
} }
......
...@@ -683,8 +683,6 @@ static int ti_ioctl(struct tty_struct *tty, ...@@ -683,8 +683,6 @@ static int ti_ioctl(struct tty_struct *tty,
struct usb_serial_port *port = tty->driver_data; struct usb_serial_port *port = tty->driver_data;
struct ti_port *tport = usb_get_serial_port_data(port); struct ti_port *tport = usb_get_serial_port_data(port);
dev_dbg(&port->dev, "%s - cmd = 0x%04X\n", __func__, cmd);
if (tport == NULL) if (tport == NULL)
return -ENODEV; return -ENODEV;
......
...@@ -405,7 +405,7 @@ static int serial_ioctl(struct tty_struct *tty, ...@@ -405,7 +405,7 @@ static int serial_ioctl(struct tty_struct *tty,
struct usb_serial_port *port = tty->driver_data; struct usb_serial_port *port = tty->driver_data;
int retval = -ENOIOCTLCMD; int retval = -ENOIOCTLCMD;
dev_dbg(tty->dev, "%s - cmd 0x%.4x\n", __func__, cmd); dev_dbg(tty->dev, "%s - cmd 0x%04x\n", __func__, cmd);
switch (cmd) { switch (cmd) {
case TIOCMIWAIT: case TIOCMIWAIT:
......
...@@ -455,8 +455,6 @@ static int whiteheat_ioctl(struct tty_struct *tty, ...@@ -455,8 +455,6 @@ static int whiteheat_ioctl(struct tty_struct *tty,
struct serial_struct serstruct; struct serial_struct serstruct;
void __user *user_arg = (void __user *)arg; void __user *user_arg = (void __user *)arg;
dev_dbg(&port->dev, "%s - cmd 0x%.4x\n", __func__, cmd);
switch (cmd) { switch (cmd) {
case TIOCGSERIAL: case TIOCGSERIAL:
memset(&serstruct, 0, sizeof(serstruct)); memset(&serstruct, 0, sizeof(serstruct));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment