[PATCH 3/3] USB: serial: enable serdev support

Marco Felsch
2024-08-07T14:09:01Z

Enable serdev support by using the serdev opt-in tty-port registration
helper.

Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
---
drivers/usb/serial/bus.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/usb/serial/bus.c b/drivers/usb/serial/bus.c
index df0196a30f33..84eca07f83fa 100644
--- a/drivers/usb/serial/bus.c
+++ b/drivers/usb/serial/bus.c
@@ -33,6 +33,7 @@ static int usb_serial_device_probe(struct device *dev)
{
struct usb_serial_port *port = to_usb_serial_port(dev);
struct usb_serial_driver *driver;
+ struct device *host_dev;
struct device *tty_dev;
int retval = 0;
int minor;
@@ -50,8 +51,9 @@ static int usb_serial_device_probe(struct device *dev)
}

minor = port->minor;
- tty_dev = tty_port_register_device(&port->port, usb_serial_tty_driver,
- minor, dev);
+ host_dev = &port->serial->interface->dev;
+ tty_dev = tty_port_register_device_serdev(&port->port,
+ usb_serial_tty_driver, minor, host_dev, dev);
if (IS_ERR(tty_dev)) {
retval = PTR_ERR(tty_dev);
goto err_port_remove;
@@ -90,7 +92,7 @@ static void usb_serial_device_remove(struct device *dev)
autopm_err = usb_autopm_get_interface(port->serial->interface);

minor = port->minor;
- tty_unregister_device(usb_serial_tty_driver, minor);
+ tty_port_unregister_device(&port->port, usb_serial_tty_driver, minor);

driver = port->serial->type;
if (driver->port_remove)

--
2.39.2