diff options
| author |   Johan Hovold <johan@kernel.org> | 2020-02-25 11:24:20 +0100 |
|---|---|---|
| committer | Johan Hovold <johan@kernel.org> | 2020-03-11 09:38:01 +0100 |
| commit | 5e95dbb62171399196a6c93426a4f355463bfbfc (patch) | |
| tree | 585d30d98a4494cde7a0f01fcf7b50f8c117bf4a /drivers/usb/serial | |
| parent | USB: serial: f81232: set F81534A serial port with RS232 mode (diff) | |
| download | linux-dev-5e95dbb62171399196a6c93426a4f355463bfbfc.tar.xz linux-dev-5e95dbb62171399196a6c93426a4f355463bfbfc.zip | |
USB: serial: clean up carrier-detect helper
Drop the struct tty_port pointer and rename the struct usb_serial_port
pointer "port", which is the named used throughout the subsystem and
incidentally also matches the kernel-doc comment.
Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'drivers/usb/serial')
| -rw-r--r-- | drivers/usb/serial/generic.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/usb/serial/generic.c b/drivers/usb/serial/generic.c index 546a1c2ce2f2..5cdf180cda23 100644 --- a/drivers/usb/serial/generic.c +++ b/drivers/usb/serial/generic.c @@ -609,12 +609,10 @@ EXPORT_SYMBOL_GPL(usb_serial_handle_break); * @tty: tty for the port * @status: new carrier detect status, nonzero if active */ -void usb_serial_handle_dcd_change(struct usb_serial_port *usb_port, +void usb_serial_handle_dcd_change(struct usb_serial_port *port, struct tty_struct *tty, unsigned int status) { - struct tty_port *port = &usb_port->port; - - dev_dbg(&usb_port->dev, "%s - status %d\n", __func__, status); + dev_dbg(&port->dev, "%s - status %d\n", __func__, status); if (tty) { struct tty_ldisc *ld = tty_ldisc_ref(tty); @@ -627,7 +625,7 @@ void usb_serial_handle_dcd_change(struct usb_serial_port *usb_port, } if (status) - wake_up_interruptible(&port->open_wait); + wake_up_interruptible(&port->port.open_wait); else if (tty && !C_CLOCAL(tty)) tty_hangup(tty); } |