[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20170106162635.19677-10-robh@kernel.org>
Date: Fri, 6 Jan 2017 10:26:35 -0600
From: Rob Herring <robh@...nel.org>
To: Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
Marcel Holtmann <marcel@...tmann.org>,
Jiri Slaby <jslaby@...e.com>,
Sebastian Reichel <sre@...nel.org>,
Arnd Bergmann <arnd@...db.de>,
"Dr . H . Nikolaus Schaller" <hns@...delico.com>,
Peter Hurley <peter@...leysoftware.com>,
Andy Shevchenko <andriy.shevchenko@...ux.intel.com>,
Alan Cox <gnomes@...rguk.ukuu.org.uk>
Cc: Loic Poulain <loic.poulain@...el.com>, Pavel Machek <pavel@....cz>,
NeilBrown <neil@...wn.name>,
Linus Walleij <linus.walleij@...aro.org>,
linux-bluetooth@...r.kernel.org, linux-serial@...r.kernel.org,
linux-kernel@...r.kernel.org
Subject: [PATCH 9/9] tty_port: register tty ports with serdev bus
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@...nel.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
Powered by blists - more mailing lists