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: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/serial/f81232.c b/drivers/usb/serial/f81232.c
index 639a18fb67e694e49d1ae6409fda5bb4f528a57f..aeb2edca1ce620d7a33406e2f6876c4d99c294d2 100644 (file)
--- a/drivers/usb/serial/f81232.c
+++ b/drivers/usb/serial/f81232.c
@@ -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;

diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 2e5cf73f121747d92f52d0b5c2703d6aa2e6e7e4..b3f712f8cf178a2c7e0c418c39a32fe2089ce886 100644 (file)
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -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;
 }
 

diff --git a/drivers/usb/serial/io_edgeport.c b/drivers/usb/serial/io_edgeport.c
index c91481d74a144fd2ae2810a2f778b30a63e78310..9c79fb22f3415dd18d7ba28f7013e894188bf4b9 100644 (file)
--- a/drivers/usb/serial/io_edgeport.c
+++ b/drivers/usb/serial/io_edgeport.c
@@ -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__);

diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c
index b7187bf3246946f3090e4f49d1110e3a0bf90486..2b3b7bfeb332ea853bc74ee50c68e69183628eaf 100644 (file)
--- a/drivers/usb/serial/io_ti.c
+++ b/drivers/usb/serial/io_ti.c
@@ -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__);

diff --git a/drivers/usb/serial/mos7720.c b/drivers/usb/serial/mos7720.c
index 439c951f261b2d492cb78696fe3ad603154406eb..b739a1732b7671daf1a3d4a0f7de8c9f5f62f063 100644 (file)
--- a/drivers/usb/serial/mos7720.c
+++ b/drivers/usb/serial/mos7720.c
@@ -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__);

diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c
index a69da83604c03da3219c2340264cff08b456a404..bc176ae61743c19495a9d59c6c53fd1e8628e4ea 100644 (file)
--- a/drivers/usb/serial/mos7840.c
+++ b/drivers/usb/serial/mos7840.c
@@ -2070,8 +2070,6 @@ static int mos7840_ioctl(struct tty_struct *tty,
        if (mos7840_port == NULL)
                return -1;
 
-       dev_dbg(&port->dev, "%s - cmd = 0x%x\n", __func__, cmd);
-
        switch (cmd) {
                /* return number of bytes available */
 

diff --git a/drivers/usb/serial/opticon.c b/drivers/usb/serial/opticon.c
index cbe779f578f9be8c1d5b1f0dfc95c1cc165a1e84..1b4f1d2479c108ddab303067f97ae4a1cee4b5e8 100644 (file)
--- a/drivers/usb/serial/opticon.c
+++ b/drivers/usb/serial/opticon.c
@@ -367,8 +367,6 @@ static int opticon_ioctl(struct tty_struct *tty,
 {
        struct usb_serial_port *port = tty->driver_data;
 
-       dev_dbg(&port->dev, "%s - cmd = 0x%x\n", __func__, cmd);
-
        switch (cmd) {
        case TIOCGSERIAL:
                return get_serial_info(port,

diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
index beb8edce4ef278c94505815a7379fd55c5a4642f..9a7dfa3738d9db7e1e353758a2c2aa7627409ade 100644 (file)
--- a/drivers/usb/serial/pl2303.c
+++ b/drivers/usb/serial/pl2303.c
@@ -648,8 +648,6 @@ static int pl2303_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);
@@ -663,7 +661,6 @@ static int pl2303_ioctl(struct tty_struct *tty,
 
                return 0;
        default:
-               dev_dbg(&port->dev, "%s not supported = 0x%04x\n", __func__, cmd);
                break;
        }
        return -ENOIOCTLCMD;

diff --git a/drivers/usb/serial/ssu100.c b/drivers/usb/serial/ssu100.c
index e5750be49054397ecb782066a913ae7a05e68c5a..a6fec959d2f85983efda5616cee59b2ef4caa03e 100644 (file)
--- a/drivers/usb/serial/ssu100.c
+++ b/drivers/usb/serial/ssu100.c
@@ -342,8 +342,6 @@ static int ssu100_ioctl(struct tty_struct *tty,
 {
        struct usb_serial_port *port = tty->driver_data;
 
-       dev_dbg(&port->dev, "%s cmd 0x%04x\n", __func__, cmd);
-
        switch (cmd) {
        case TIOCGSERIAL:
                return get_serial_info(port,
@@ -352,8 +350,6 @@ static int ssu100_ioctl(struct tty_struct *tty,
                break;
        }
 
-       dev_dbg(&port->dev, "%s arg not supported\n", __func__);
-
        return -ENOIOCTLCMD;
 }
 

diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c
index 87188095fa1963c273c162efba9a72fcfeb4336e..4a649edaa2c0004fbb7f1957ccfc0ae7a0e51975 100644 (file)
--- a/drivers/usb/serial/ti_usb_3410_5052.c
+++ b/drivers/usb/serial/ti_usb_3410_5052.c
@@ -683,8 +683,6 @@ static int ti_ioctl(struct tty_struct *tty,
        struct usb_serial_port *port = tty->driver_data;
        struct ti_port *tport = usb_get_serial_port_data(port);
 
-       dev_dbg(&port->dev, "%s - cmd = 0x%04X\n", __func__, cmd);
-
        if (tport == NULL)
                return -ENODEV;
 

diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index 6091bd5a1f4f255eca73b48dfcce56cfbf88de7b..7c9dc28640bb9654c9d3b6a6a31e70112ba69692 100644 (file)
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -405,7 +405,7 @@ static int serial_ioctl(struct tty_struct *tty,
        struct usb_serial_port *port = tty->driver_data;
        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) {
        case TIOCMIWAIT:

diff --git a/drivers/usb/serial/whiteheat.c b/drivers/usb/serial/whiteheat.c
index 36a7740e827c997ebbc156bfcb6e908cb02d1804..d23290e496ef2f6411dd450875691560ee34061c 100644 (file)
--- a/drivers/usb/serial/whiteheat.c
+++ b/drivers/usb/serial/whiteheat.c
@@ -455,8 +455,6 @@ static int whiteheat_ioctl(struct tty_struct *tty,
        struct serial_struct serstruct;
        void __user *user_arg = (void __user *)arg;
 
-       dev_dbg(&port->dev, "%s - cmd 0x%.4x\n", __func__, cmd);
-
        switch (cmd) {
        case TIOCGSERIAL:
                memset(&serstruct, 0, sizeof(serstruct));