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

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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>

Johan Hovold 5 years ago 07125072 f8edbd51

+21 -22

3 changed files

expand all

drivers

usb

serial

metro-usb.c

upd78f0730.c

usb-serial.c

+2 -2

drivers/usb/serial/metro-usb.c

··· 299 299 unsigned long flags = 0; 300 300 unsigned long control_state = 0; 301 301 302 - dev_dbg(tty->dev, "%s - set=%d, clear=%d\n", __func__, set, clear); 302 + dev_dbg(&port->dev, "%s - set=%d, clear=%d\n", __func__, set, clear); 303 303 304 304 spin_lock_irqsave(&metro_priv->lock, flags); 305 305 control_state = metro_priv->control_state; ··· 334 334 /* Submit the urb to read from the port. */ 335 335 result = usb_submit_urb(port->interrupt_in_urb, GFP_ATOMIC); 336 336 if (result) 337 - dev_err(tty->dev, 337 + dev_err(&port->dev, 338 338 "failed submitting interrupt in urb error code=%d\n", 339 339 result); 340 340 }

+3 -4

drivers/usb/serial/upd78f0730.c

··· 182 182 183 183 static int upd78f0730_tiocmget(struct tty_struct *tty) 184 184 { 185 - struct device *dev = tty->dev; 186 185 struct upd78f0730_port_private *private; 187 186 struct usb_serial_port *port = tty->driver_data; 188 187 int signals; ··· 196 197 res = ((signals & UPD78F0730_DTR) ? TIOCM_DTR : 0) | 197 198 ((signals & UPD78F0730_RTS) ? TIOCM_RTS : 0); 198 199 199 - dev_dbg(dev, "%s - res = %x\n", __func__, res); 200 + dev_dbg(&port->dev, "%s - res = %x\n", __func__, res); 200 201 201 202 return res; 202 203 } ··· 204 205 static int upd78f0730_tiocmset(struct tty_struct *tty, 205 206 unsigned int set, unsigned int clear) 206 207 { 207 - struct device *dev = tty->dev; 208 208 struct usb_serial_port *port = tty->driver_data; 209 209 struct upd78f0730_port_private *private; 210 210 struct upd78f0730_set_dtr_rts request; 211 + struct device *dev = &port->dev; 211 212 int res; 212 213 213 214 private = usb_get_serial_port_data(port); ··· 240 241 241 242 static void upd78f0730_break_ctl(struct tty_struct *tty, int break_state) 242 243 { 243 - struct device *dev = tty->dev; 244 244 struct upd78f0730_port_private *private; 245 245 struct usb_serial_port *port = tty->driver_data; 246 246 struct upd78f0730_set_dtr_rts request; 247 + struct device *dev = &port->dev; 247 248 248 249 private = usb_get_serial_port_data(port); 249 250

+16 -16

drivers/usb/serial/usb-serial.c

··· 281 281 { 282 282 struct usb_serial_port *port = tty->driver_data; 283 283 284 - dev_dbg(tty->dev, "%s\n", __func__); 284 + dev_dbg(&port->dev, "%s\n", __func__); 285 285 286 286 return tty_port_open(&port->port, tty, filp); 287 287 } ··· 310 310 { 311 311 struct usb_serial_port *port = tty->driver_data; 312 312 313 - dev_dbg(tty->dev, "%s\n", __func__); 313 + dev_dbg(&port->dev, "%s\n", __func__); 314 314 315 315 tty_port_hangup(&port->port); 316 316 } ··· 319 319 { 320 320 struct usb_serial_port *port = tty->driver_data; 321 321 322 - dev_dbg(tty->dev, "%s\n", __func__); 322 + dev_dbg(&port->dev, "%s\n", __func__); 323 323 324 324 tty_port_close(&port->port, tty, filp); 325 325 } ··· 339 339 struct usb_serial *serial; 340 340 struct module *owner; 341 341 342 - dev_dbg(tty->dev, "%s\n", __func__); 342 + dev_dbg(&port->dev, "%s\n", __func__); 343 343 344 344 /* The console is magical. Do not hang up the console hardware 345 345 * or there will be tears. ··· 367 367 if (port->serial->dev->state == USB_STATE_NOTATTACHED) 368 368 goto exit; 369 369 370 - dev_dbg(tty->dev, "%s - %d byte(s)\n", __func__, count); 370 + dev_dbg(&port->dev, "%s - %d byte(s)\n", __func__, count); 371 371 372 372 retval = port->serial->type->write(tty, port, buf, count); 373 373 if (retval < 0) ··· 380 380 { 381 381 struct usb_serial_port *port = tty->driver_data; 382 382 383 - dev_dbg(tty->dev, "%s\n", __func__); 383 + dev_dbg(&port->dev, "%s\n", __func__); 384 384 385 385 return port->serial->type->write_room(tty); 386 386 } ··· 390 390 struct usb_serial_port *port = tty->driver_data; 391 391 struct usb_serial *serial = port->serial; 392 392 393 - dev_dbg(tty->dev, "%s\n", __func__); 393 + dev_dbg(&port->dev, "%s\n", __func__); 394 394 395 395 if (serial->disconnected) 396 396 return 0; ··· 403 403 struct usb_serial_port *port = tty->driver_data; 404 404 struct usb_serial *serial = port->serial; 405 405 406 - dev_dbg(tty->dev, "%s\n", __func__); 406 + dev_dbg(&port->dev, "%s\n", __func__); 407 407 408 408 if (!port->serial->type->wait_until_sent) 409 409 return; ··· 418 418 { 419 419 struct usb_serial_port *port = tty->driver_data; 420 420 421 - dev_dbg(tty->dev, "%s\n", __func__); 421 + dev_dbg(&port->dev, "%s\n", __func__); 422 422 423 423 if (port->serial->type->throttle) 424 424 port->serial->type->throttle(tty); ··· 428 428 { 429 429 struct usb_serial_port *port = tty->driver_data; 430 430 431 - dev_dbg(tty->dev, "%s\n", __func__); 431 + dev_dbg(&port->dev, "%s\n", __func__); 432 432 433 433 if (port->serial->type->unthrottle) 434 434 port->serial->type->unthrottle(tty); ··· 501 501 struct usb_serial_port *port = tty->driver_data; 502 502 int retval = -ENOIOCTLCMD; 503 503 504 - dev_dbg(tty->dev, "%s - cmd 0x%04x\n", __func__, cmd); 504 + dev_dbg(&port->dev, "%s - cmd 0x%04x\n", __func__, cmd); 505 505 506 506 switch (cmd) { 507 507 case TIOCMIWAIT: ··· 520 520 { 521 521 struct usb_serial_port *port = tty->driver_data; 522 522 523 - dev_dbg(tty->dev, "%s\n", __func__); 523 + dev_dbg(&port->dev, "%s\n", __func__); 524 524 525 525 if (port->serial->type->set_termios) 526 526 port->serial->type->set_termios(tty, port, old); ··· 532 532 { 533 533 struct usb_serial_port *port = tty->driver_data; 534 534 535 - dev_dbg(tty->dev, "%s\n", __func__); 535 + dev_dbg(&port->dev, "%s\n", __func__); 536 536 537 537 if (port->serial->type->break_ctl) 538 538 port->serial->type->break_ctl(tty, break_state); ··· 579 579 { 580 580 struct usb_serial_port *port = tty->driver_data; 581 581 582 - dev_dbg(tty->dev, "%s\n", __func__); 582 + dev_dbg(&port->dev, "%s\n", __func__); 583 583 584 584 if (port->serial->type->tiocmget) 585 585 return port->serial->type->tiocmget(tty); ··· 591 591 { 592 592 struct usb_serial_port *port = tty->driver_data; 593 593 594 - dev_dbg(tty->dev, "%s\n", __func__); 594 + dev_dbg(&port->dev, "%s\n", __func__); 595 595 596 596 if (port->serial->type->tiocmset) 597 597 return port->serial->type->tiocmset(tty, set, clear); ··· 603 603 { 604 604 struct usb_serial_port *port = tty->driver_data; 605 605 606 - dev_dbg(tty->dev, "%s\n", __func__); 606 + dev_dbg(&port->dev, "%s\n", __func__); 607 607 608 608 if (port->serial->type->get_icount) 609 609 return port->serial->type->get_icount(tty, icount);