Commit 688915b1 authored by Mathias Nyman's avatar Mathias Nyman Committed by Greg Kroah-Hartman
Browse files

xhci: dbgcap: remove dbc dependency on dbctty specific flag 



dbc should not be aware of, or use any dbctty specific variables.
currenly dbc driver reads the port->registered flag to see if the
callbacks should be called.

Only makes these decisions based on dbc internal state instead.

Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Link: https://lore.kernel.org/r/20200723144530.9992-27-mathias.nyman@linux.intel.com


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

drivers/usb/host/xhci-dbgcap.c

+12 −4
Original line number Diff line number Diff line
@@ -630,14 +630,22 @@ static void xhci_dbc_stop(struct xhci_dbc *dbc) 
{

	int ret;

	unsigned long		flags;

	struct dbc_port		*port = &dbc->port;



	WARN_ON(!dbc);



	cancel_delayed_work_sync(&dbc->event_work);



	if (port->registered && dbc->driver->disconnect)

	switch (dbc->state) {

	case DS_DISABLED:

		return;

	case DS_CONFIGURED:

	case DS_STALLED:

		if (dbc->driver->disconnect)

			dbc->driver->disconnect(dbc);

		break;

	default:

		break;

	}



	cancel_delayed_work_sync(&dbc->event_work);



	spin_lock_irqsave(&dbc->lock, flags);

	ret = xhci_do_dbc_stop(dbc);

drivers/usb/host/xhci-dbgtty.c

+5 −0
Original line number Diff line number Diff line
@@ -399,6 +399,9 @@ int xhci_dbc_tty_register_device(struct xhci_dbc *dbc) 
	struct device		*tty_dev;

	struct dbc_port		*port = &dbc->port;



	if (port->registered)

		return -EBUSY;



	xhci_dbc_tty_init_port(dbc, port);

	tty_dev = tty_port_register_device(&port->port,

					   dbc_tty_driver, 0, NULL);
@@ -445,6 +448,8 @@ void xhci_dbc_tty_unregister_device(struct xhci_dbc *dbc) 
{

	struct dbc_port		*port = &dbc->port;



	if (!port->registered)

		return;

	tty_unregister_device(dbc_tty_driver, 0);

	xhci_dbc_tty_exit_port(port);

	port->registered = false;

CRA Git | Maintained and supported by SUSTech CRA and CCSE