Skip to contentSkip to conversation

USB: serial: clean up some kernel doc

PATCH In review Johan Hovold 1 participant 4 messages Feb 25, 2020

Subsystems (2)
USB USB serial
lore
Share & tools
lore

Johan Hovold

author maintainer
#0 lore raw

cover USB: serial: clean up some kernel doc

Fix up a couple of kernel doc comments that used the wrong parameter names.

Johan

Johan Hovold (2):
USB: serial: clean up carrier-detect helper
USB: serial: fix tty cleanup op kernel-doc

 drivers/usb/serial/generic.c    | 8 +++-----
 drivers/usb/serial/usb-serial.c | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)
Signature · 1 line
2.24.1
author maintainer
#1 lore raw

PATCH 1/2 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 <[email protected]>
---
 drivers/usb/serial/generic.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/usb/serial/generic.c +3 -5
index 546a1c2ce2f2..5cdf180cda23 100644
@@ -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);
 }
Signature · 1 line
2.24.1
author maintainer
#2 lore raw

PATCH 2/2 USB: serial: fix tty cleanup op kernel-doc

In reply to Johan Hovold

The tty cleanup operation is called with a struct tty as it's sole parameter.

Signed-off-by Johan Hovold <[email protected]>
---
 drivers/usb/serial/usb-serial.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/serial/usb-serial.c +1 -1
index dc7a65b9ec98..27e3bb58c872 100644
@@ -288,7 +288,7 @@ static void serial_close(struct tty_struct *tty, struct file *filp)
 
 /**
  * serial_cleanup - free resources post close/hangup
- * @port: port to free up
+ * @tty: tty to clean up
  *
  * Do the resource freeing and refcount dropping for the port.
  * Avoid freeing the console.
Signature · 1 line
2.24.1
author maintainer
#3 lore raw

Re: [PATCH 2/2] USB: serial: fix tty cleanup op kernel-doc

Quoted 1 line · Johan Hovold

The tty cleanup operation is called with a struct tty as it's sole

I'll fix the 'its' typo when applying...

Quoted 1 line

parameter.

Johan