[PATCH 9/9] tty_port: register tty ports with serdev bus
From: Rob Herring <robh@kernel.org>
Date: 2017-01-06 16:28:31
Also in:
linux-serial, lkml
Subsystem:
the rest, tty layer and serial drivers · Maintainers:
Linus Torvalds, Greg Kroah-Hartman, Jiri Slaby
Register a serdev controller with the serdev bus when a tty_port is registered. This creates the serdev controller and create's serdev devices for any DT child nodes of the tty_port's parent (i.e. the UART device). Signed-off-by: Rob Herring <robh@kernel.org> --- drivers/tty/tty_port.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/drivers/tty/tty_port.c b/drivers/tty/tty_port.c
index 232a8cbf47bc..032786e5509e 100644
--- a/drivers/tty/tty_port.c
+++ b/drivers/tty/tty_port.c@@ -16,6 +16,7 @@ #include <linux/bitops.h> #include <linux/delay.h> #include <linux/module.h> +#include <linux/serdev.h> static int tty_port_default_receive_buf(struct tty_port *port, const unsigned char *p,
@@ -125,9 +126,17 @@ struct device *tty_port_register_device_attr(struct tty_port *port, struct device *device, void *drvdata, const struct attribute_group **attr_grp) { + struct device *ttydev; + tty_port_link_device(port, driver, index); - return tty_register_device_attr(driver, index, device, drvdata, + ttydev = tty_register_device_attr(driver, index, device, drvdata, attr_grp); + if (!ttydev) + return NULL; + + serdev_tty_port_register(port, device, driver, index); + return ttydev; + } EXPORT_SYMBOL_GPL(tty_port_register_device_attr);
@@ -177,6 +186,9 @@ static void tty_port_destructor(struct kref *kref) /* check if last port ref was dropped before tty release */ if (WARN_ON(port->itty)) return; + + serdev_tty_port_unregister(port); + if (port->xmit_buf) free_page((unsigned long)port->xmit_buf); tty_port_destroy(port);
--
2.10.1