Commit 2b5eac0f authored by Jiri Slaby (SUSE)'s avatar Jiri Slaby (SUSE) Committed by Greg Kroah-Hartman
Browse files

tty: introduce and use tty_port_tty_vhangup() helper 



This code (tty_get -> vhangup -> tty_put) is repeated on few places.
Introduce a helper similar to tty_port_tty_hangup() (asynchronous) to
handle even vhangup (synchronous).

And use it on those places.

In fact, reuse the tty_port_tty_hangup()'s code and call tty_vhangup()
depending on a new bool parameter.

Signed-off-by: default avatar"Jiri Slaby (SUSE)" <jirislaby@kernel.org>
Cc: Karsten Keil <isdn@linux-pingi.de>
Cc: David Lin <dtwlin@gmail.com>
Cc: Johan Hovold <johan@kernel.org>
Cc: Alex Elder <elder@kernel.org>
Cc: Oliver Neukum <oneukum@suse.com>
Cc: Marcel Holtmann <marcel@holtmann.org>
Cc: Johan Hedberg <johan.hedberg@gmail.com>
Cc: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
Reviewed-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Link: https://lore.kernel.org/r/20250611100319.186924-2-jirislaby@kernel.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e04c78d8

drivers/isdn/capi/capi.c

+1 −7
Original line number Diff line number Diff line
@@ -306,15 +306,9 @@ static void capincci_alloc_minor(struct capidev *cdev, struct capincci *np) 
static void capincci_free_minor(struct capincci *np)

{

	struct capiminor *mp = np->minorp;

	struct tty_struct *tty;



	if (mp) {

		tty = tty_port_tty_get(&mp->port);

		if (tty) {

			tty_vhangup(tty);

			tty_kref_put(tty);

		}



		tty_port_tty_vhangup(&mp->port);

		capiminor_free(mp);

	}

}

drivers/staging/greybus/uart.c

+1 −6
Original line number Diff line number Diff line
@@ -916,7 +916,6 @@ static void gb_uart_remove(struct gbphy_device *gbphy_dev) 
{

	struct gb_tty *gb_tty = gb_gbphy_get_data(gbphy_dev);

	struct gb_connection *connection = gb_tty->connection;

	struct tty_struct *tty;

	int ret;



	ret = gbphy_runtime_get_sync(gbphy_dev);
@@ -929,11 +928,7 @@ static void gb_uart_remove(struct gbphy_device *gbphy_dev) 
	wake_up_all(&gb_tty->wioctl);

	mutex_unlock(&gb_tty->mutex);



	tty = tty_port_tty_get(&gb_tty->port);

	if (tty) {

		tty_vhangup(tty);

		tty_kref_put(tty);

	}

	tty_port_tty_vhangup(&gb_tty->port);



	gb_connection_disable_rx(connection);

	tty_unregister_device(gb_tty_driver, gb_tty->minor);

drivers/tty/serial/serial_core.c

+1 −6
Original line number Diff line number Diff line
@@ -3209,7 +3209,6 @@ static void serial_core_remove_one_port(struct uart_driver *drv, 
	struct uart_state *state = drv->state + uport->line;

	struct tty_port *port = &state->port;

	struct uart_port *uart_port;

	struct tty_struct *tty;



	mutex_lock(&port->mutex);

	uart_port = uart_port_check(state);
@@ -3228,11 +3227,7 @@ static void serial_core_remove_one_port(struct uart_driver *drv, 
	 */

	tty_port_unregister_device(port, drv->tty_driver, uport->line);



	tty = tty_port_tty_get(port);

	if (tty) {

		tty_vhangup(port->tty);

		tty_kref_put(tty);

	}

	tty_port_tty_vhangup(port);



	/*

	 * If the port is used as a console, unregister it

drivers/tty/tty_port.c

+8 −4
Original line number Diff line number Diff line
@@ -396,15 +396,19 @@ EXPORT_SYMBOL(tty_port_hangup); 
 * @port: tty port

 * @check_clocal: hang only ttys with %CLOCAL unset?

 */

void tty_port_tty_hangup(struct tty_port *port, bool check_clocal)

void __tty_port_tty_hangup(struct tty_port *port, bool check_clocal, bool async)

{

	struct tty_struct *tty = tty_port_tty_get(port);



	if (tty && (!check_clocal || !C_CLOCAL(tty)))

	if (tty && (!check_clocal || !C_CLOCAL(tty))) {

		if (async)

			tty_hangup(tty);

		else

			tty_vhangup(tty);

	}

	tty_kref_put(tty);

}

EXPORT_SYMBOL_GPL(tty_port_tty_hangup);

EXPORT_SYMBOL_GPL(__tty_port_tty_hangup);



/**

 * tty_port_tty_wakeup - helper to wake up a tty

drivers/usb/class/cdc-acm.c

+1 −6
Original line number Diff line number Diff line
@@ -1571,7 +1571,6 @@ static int acm_probe(struct usb_interface *intf, 
static void acm_disconnect(struct usb_interface *intf)

{

	struct acm *acm = usb_get_intfdata(intf);

	struct tty_struct *tty;

	int i;



	/* sibling interface is already cleaning up */
@@ -1598,11 +1597,7 @@ static void acm_disconnect(struct usb_interface *intf) 
	usb_set_intfdata(acm->data, NULL);

	mutex_unlock(&acm->mutex);



	tty = tty_port_tty_get(&acm->port);

	if (tty) {

		tty_vhangup(tty);

		tty_kref_put(tty);

	}

	tty_port_tty_vhangup(&acm->port);



	cancel_delayed_work_sync(&acm->dwork);