USB: serial: do not use tty class device for debugging

Use the port struct device rather than tty class device for debugging.

Note that while USB serial doesn't support serdev yet (due to serdev not
handling hotplugging), serdev ttys do not have a corresponding class
device and would have been logged using a "(NULL device *):" prefix.

Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Johan Hovold <johan@kernel.org>

diff --git a/drivers/usb/serial/metro-usb.c b/drivers/usb/serial/metro-usb.c
index 0bfe4459c37f53d49f23e5fc8e3fc0dc6e8a5916..f9ce9e7b9b807cd4c5928250d7e1f0e52e3783b3 100644 (file)
--- a/drivers/usb/serial/metro-usb.c
+++ b/drivers/usb/serial/metro-usb.c
@@ -299,7 +299,7 @@ static int metrousb_tiocmset(struct tty_struct *tty,
        unsigned long flags = 0;
        unsigned long control_state = 0;
 
-       dev_dbg(tty->dev, "%s - set=%d, clear=%d\n", __func__, set, clear);
+       dev_dbg(&port->dev, "%s - set=%d, clear=%d\n", __func__, set, clear);
 
        spin_lock_irqsave(&metro_priv->lock, flags);
        control_state = metro_priv->control_state;
@@ -334,7 +334,7 @@ static void metrousb_unthrottle(struct tty_struct *tty)
        /* Submit the urb to read from the port. */
        result = usb_submit_urb(port->interrupt_in_urb, GFP_ATOMIC);
        if (result)
-               dev_err(tty->dev,
+               dev_err(&port->dev,
                        "failed submitting interrupt in urb error code=%d\n",
                        result);
 }

diff --git a/drivers/usb/serial/upd78f0730.c b/drivers/usb/serial/upd78f0730.c
index 26d7b003b7e3a72a08f10aa9bbdc8bd1740e6c18..63d4a784ae457ccae525ba0cd24089c05a4ab959 100644 (file)
--- a/drivers/usb/serial/upd78f0730.c
+++ b/drivers/usb/serial/upd78f0730.c
@@ -182,7 +182,6 @@ static void upd78f0730_port_remove(struct usb_serial_port *port)
 
 static int upd78f0730_tiocmget(struct tty_struct *tty)
 {
-       struct device *dev = tty->dev;
        struct upd78f0730_port_private *private;
        struct usb_serial_port *port = tty->driver_data;
        int signals;
@@ -197,7 +196,7 @@ static int upd78f0730_tiocmget(struct tty_struct *tty)
        res = ((signals & UPD78F0730_DTR) ? TIOCM_DTR : 0) |
                ((signals & UPD78F0730_RTS) ? TIOCM_RTS : 0);
 
-       dev_dbg(dev, "%s - res = %x\n", __func__, res);
+       dev_dbg(&port->dev, "%s - res = %x\n", __func__, res);
 
        return res;
 }
@@ -205,10 +204,10 @@ static int upd78f0730_tiocmget(struct tty_struct *tty)
 static int upd78f0730_tiocmset(struct tty_struct *tty,
                        unsigned int set, unsigned int clear)
 {
-       struct device *dev = tty->dev;
        struct usb_serial_port *port = tty->driver_data;
        struct upd78f0730_port_private *private;
        struct upd78f0730_set_dtr_rts request;
+       struct device *dev = &port->dev;
        int res;
 
        private = usb_get_serial_port_data(port);
@@ -241,10 +240,10 @@ static int upd78f0730_tiocmset(struct tty_struct *tty,
 
 static void upd78f0730_break_ctl(struct tty_struct *tty, int break_state)
 {
-       struct device *dev = tty->dev;
        struct upd78f0730_port_private *private;
        struct usb_serial_port *port = tty->driver_data;
        struct upd78f0730_set_dtr_rts request;
+       struct device *dev = &port->dev;
 
        private = usb_get_serial_port_data(port);
 

diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index 255f562ef1a00b9cfbfa85e1ed89eff0de6fd4e5..98b33b1b5357c1c89ae4dd54d3282631869ac0a0 100644 (file)
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -281,7 +281,7 @@ static int serial_open(struct tty_struct *tty, struct file *filp)
 {
        struct usb_serial_port *port = tty->driver_data;
 
-       dev_dbg(tty->dev, "%s\n", __func__);
+       dev_dbg(&port->dev, "%s\n", __func__);
 
        return tty_port_open(&port->port, tty, filp);
 }
@@ -310,7 +310,7 @@ static void serial_hangup(struct tty_struct *tty)
 {
        struct usb_serial_port *port = tty->driver_data;
 
-       dev_dbg(tty->dev, "%s\n", __func__);
+       dev_dbg(&port->dev, "%s\n", __func__);
 
        tty_port_hangup(&port->port);
 }
@@ -319,7 +319,7 @@ static void serial_close(struct tty_struct *tty, struct file *filp)
 {
        struct usb_serial_port *port = tty->driver_data;
 
-       dev_dbg(tty->dev, "%s\n", __func__);
+       dev_dbg(&port->dev, "%s\n", __func__);
 
        tty_port_close(&port->port, tty, filp);
 }
@@ -339,7 +339,7 @@ static void serial_cleanup(struct tty_struct *tty)
        struct usb_serial *serial;
        struct module *owner;
 
-       dev_dbg(tty->dev, "%s\n", __func__);
+       dev_dbg(&port->dev, "%s\n", __func__);
 
        /* The console is magical.  Do not hang up the console hardware
         * or there will be tears.
@@ -367,7 +367,7 @@ static int serial_write(struct tty_struct *tty, const unsigned char *buf,
        if (port->serial->dev->state == USB_STATE_NOTATTACHED)
                goto exit;
 
-       dev_dbg(tty->dev, "%s - %d byte(s)\n", __func__, count);
+       dev_dbg(&port->dev, "%s - %d byte(s)\n", __func__, count);
 
        retval = port->serial->type->write(tty, port, buf, count);
        if (retval < 0)
@@ -380,7 +380,7 @@ static int serial_write_room(struct tty_struct *tty)
 {
        struct usb_serial_port *port = tty->driver_data;
 
-       dev_dbg(tty->dev, "%s\n", __func__);
+       dev_dbg(&port->dev, "%s\n", __func__);
 
        return port->serial->type->write_room(tty);
 }
@@ -390,7 +390,7 @@ static int serial_chars_in_buffer(struct tty_struct *tty)
        struct usb_serial_port *port = tty->driver_data;
        struct usb_serial *serial = port->serial;
 
-       dev_dbg(tty->dev, "%s\n", __func__);
+       dev_dbg(&port->dev, "%s\n", __func__);
 
        if (serial->disconnected)
                return 0;
@@ -403,7 +403,7 @@ static void serial_wait_until_sent(struct tty_struct *tty, int timeout)
        struct usb_serial_port *port = tty->driver_data;
        struct usb_serial *serial = port->serial;
 
-       dev_dbg(tty->dev, "%s\n", __func__);
+       dev_dbg(&port->dev, "%s\n", __func__);
 
        if (!port->serial->type->wait_until_sent)
                return;
@@ -418,7 +418,7 @@ static void serial_throttle(struct tty_struct *tty)
 {
        struct usb_serial_port *port = tty->driver_data;
 
-       dev_dbg(tty->dev, "%s\n", __func__);
+       dev_dbg(&port->dev, "%s\n", __func__);
 
        if (port->serial->type->throttle)
                port->serial->type->throttle(tty);
@@ -428,7 +428,7 @@ static void serial_unthrottle(struct tty_struct *tty)
 {
        struct usb_serial_port *port = tty->driver_data;
 
-       dev_dbg(tty->dev, "%s\n", __func__);
+       dev_dbg(&port->dev, "%s\n", __func__);
 
        if (port->serial->type->unthrottle)
                port->serial->type->unthrottle(tty);
@@ -501,7 +501,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%04x\n", __func__, cmd);
+       dev_dbg(&port->dev, "%s - cmd 0x%04x\n", __func__, cmd);
 
        switch (cmd) {
        case TIOCMIWAIT:
@@ -520,7 +520,7 @@ static void serial_set_termios(struct tty_struct *tty, struct ktermios *old)
 {
        struct usb_serial_port *port = tty->driver_data;
 
-       dev_dbg(tty->dev, "%s\n", __func__);
+       dev_dbg(&port->dev, "%s\n", __func__);
 
        if (port->serial->type->set_termios)
                port->serial->type->set_termios(tty, port, old);
@@ -532,7 +532,7 @@ static int serial_break(struct tty_struct *tty, int break_state)
 {
        struct usb_serial_port *port = tty->driver_data;
 
-       dev_dbg(tty->dev, "%s\n", __func__);
+       dev_dbg(&port->dev, "%s\n", __func__);
 
        if (port->serial->type->break_ctl)
                port->serial->type->break_ctl(tty, break_state);
@@ -579,7 +579,7 @@ static int serial_tiocmget(struct tty_struct *tty)
 {
        struct usb_serial_port *port = tty->driver_data;
 
-       dev_dbg(tty->dev, "%s\n", __func__);
+       dev_dbg(&port->dev, "%s\n", __func__);
 
        if (port->serial->type->tiocmget)
                return port->serial->type->tiocmget(tty);
@@ -591,7 +591,7 @@ static int serial_tiocmset(struct tty_struct *tty,
 {
        struct usb_serial_port *port = tty->driver_data;
 
-       dev_dbg(tty->dev, "%s\n", __func__);
+       dev_dbg(&port->dev, "%s\n", __func__);
 
        if (port->serial->type->tiocmset)
                return port->serial->type->tiocmset(tty, set, clear);
@@ -603,7 +603,7 @@ static int serial_get_icount(struct tty_struct *tty,
 {
        struct usb_serial_port *port = tty->driver_data;
 
-       dev_dbg(tty->dev, "%s\n", __func__);
+       dev_dbg(&port->dev, "%s\n", __func__);
 
        if (port->serial->type->get_icount)
                return port->serial->type->get_icount(tty, icount);