aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2015-09-19 11:43:07 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-10-04 17:44:52 +0100
commit57e7e2a64a49961d2810a6f4f0e1ca2699338ec2 (patch)
tree9fcb462ecb005ef1291b6e12dd3bb1db6edc52d8 /drivers
parentserial: 68328serial: Use NULL for pointers (diff)
downloadlinux-dev-57e7e2a64a49961d2810a6f4f0e1ca2699338ec2.tar.xz
linux-dev-57e7e2a64a49961d2810a6f4f0e1ca2699338ec2.zip
serial: mux: Convert to uart_console_device instead of open-coded
The implementation of mux_console_device() is very similar to uart_console_device(). Setting .data field in mux_console then we can convert to use uart_console_device(). Signed-off-by: Axel Lin <axel.lin@ingics.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/tty/serial/mux.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/tty/serial/mux.c b/drivers/tty/serial/mux.c
index dd26511ad875..8a4be4b73723 100644
--- a/drivers/tty/serial/mux.c
+++ b/drivers/tty/serial/mux.c
@@ -412,19 +412,14 @@ static int mux_console_setup(struct console *co, char *options)
return 0;
}
-struct tty_driver *mux_console_device(struct console *co, int *index)
-{
- *index = co->index;
- return mux_driver.tty_driver;
-}
-
static struct console mux_console = {
.name = "ttyB",
.write = mux_console_write,
- .device = mux_console_device,
+ .device = uart_console_device,
.setup = mux_console_setup,
.flags = CON_ENABLED | CON_PRINTBUFFER,
.index = 0,
+ .data = &mux_driver,
};
#define MUX_CONSOLE &mux_console