TTY: nfcon, add tty_port and link it
authorJiri Slaby <jslaby@suse.cz>
Tue, 7 Aug 2012 19:47:56 +0000 (21:47 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 13 Aug 2012 23:50:20 +0000 (16:50 -0700)
Every tty driver needs tty_port for each line. So let us add one to
nfcon too. And link it so that the tty layer knows about it.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: linux-m68k@lists.linux-m68k.org
Acked-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/m68k/emu/nfcon.c

index 8db25e8069471f03f07335153bf8137c05ef41b4..16d170f53bfd0d521a15281b4565d3fae9f1ad44 100644 (file)
@@ -19,6 +19,7 @@
 #include <asm/natfeat.h>
 
 static int stderr_id;
+static struct tty_port nfcon_tty_port;
 static struct tty_driver *nfcon_tty_driver;
 
 static void nfputs(const char *str, unsigned int count)
@@ -119,6 +120,8 @@ static int __init nfcon_init(void)
 {
        int res;
 
+       tty_port_init(&nfcon_tty_port);
+
        stderr_id = nf_get_id("NF_STDERR");
        if (!stderr_id)
                return -ENODEV;
@@ -135,6 +138,7 @@ static int __init nfcon_init(void)
        nfcon_tty_driver->flags = TTY_DRIVER_REAL_RAW;
 
        tty_set_operations(nfcon_tty_driver, &nfcon_tty_ops);
+       tty_port_link_device(&nfcon_tty_port, nfcon_tty_driver, 0);
        res = tty_register_driver(nfcon_tty_driver);
        if (res) {
                pr_err("failed to register nfcon tty driver\n");