From d003e982c1d2b8bf8418c415b0b87175d6a1bda2 Mon Sep 17 00:00:00 2001 From: Richard Weinberger Date: Mon, 4 Jun 2012 20:53:13 +0200 Subject: um: remove line_ioctl() line_ioctl() has no real function. Signed-off-by: Richard Weinberger --- arch/um/drivers/ssl.c | 1 - 1 file changed, 1 deletion(-) (limited to 'arch/um/drivers/ssl.c') diff --git a/arch/um/drivers/ssl.c b/arch/um/drivers/ssl.c index e09801a1327b..a39d53eaf57b 100644 --- a/arch/um/drivers/ssl.c +++ b/arch/um/drivers/ssl.c @@ -129,7 +129,6 @@ static const struct tty_operations ssl_ops = { .flush_buffer = line_flush_buffer, .flush_chars = line_flush_chars, .set_termios = line_set_termios, - .ioctl = line_ioctl, .throttle = line_throttle, .unthrottle = line_unthrottle, #if 0 -- cgit v1.2.3 From df7b86f313fd26b5021afde7e66b35f9267b1261 Mon Sep 17 00:00:00 2001 From: Richard Weinberger Date: Mon, 4 Jun 2012 20:58:18 +0200 Subject: um: Remove dead code Signed-off-by: Richard Weinberger --- arch/um/drivers/ssl.c | 26 -------------------------- 1 file changed, 26 deletions(-) (limited to 'arch/um/drivers/ssl.c') diff --git a/arch/um/drivers/ssl.c b/arch/um/drivers/ssl.c index a39d53eaf57b..cba95d959af1 100644 --- a/arch/um/drivers/ssl.c +++ b/arch/um/drivers/ssl.c @@ -98,27 +98,6 @@ static int ssl_open(struct tty_struct *tty, struct file *filp) return err; } -#if 0 -static void ssl_flush_buffer(struct tty_struct *tty) -{ - return; -} - -static void ssl_stop(struct tty_struct *tty) -{ - printk(KERN_ERR "Someone should implement ssl_stop\n"); -} - -static void ssl_start(struct tty_struct *tty) -{ - printk(KERN_ERR "Someone should implement ssl_start\n"); -} - -void ssl_hangup(struct tty_struct *tty) -{ -} -#endif - static const struct tty_operations ssl_ops = { .open = ssl_open, .close = line_close, @@ -131,11 +110,6 @@ static const struct tty_operations ssl_ops = { .set_termios = line_set_termios, .throttle = line_throttle, .unthrottle = line_unthrottle, -#if 0 - .stop = ssl_stop, - .start = ssl_start, - .hangup = ssl_hangup, -#endif }; /* Changed by ssl_init and referenced by ssl_exit, which are both serialized -- cgit v1.2.3 From 79e0273d187c807dfec8d0cf450b8187cab5d3af Mon Sep 17 00:00:00 2001 From: Richard Weinberger Date: Mon, 4 Jun 2012 21:57:24 +0200 Subject: um: fully use tty_port ... use all tty_port helpers Signed-off-by: Richard Weinberger --- arch/um/drivers/ssl.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'arch/um/drivers/ssl.c') diff --git a/arch/um/drivers/ssl.c b/arch/um/drivers/ssl.c index cba95d959af1..7e86f0070123 100644 --- a/arch/um/drivers/ssl.c +++ b/arch/um/drivers/ssl.c @@ -87,19 +87,13 @@ static int ssl_remove(int n, char **error_out) error_out); } -static int ssl_open(struct tty_struct *tty, struct file *filp) +static int ssl_install(struct tty_driver *driver, struct tty_struct *tty) { - int err = line_open(serial_lines, tty); - - if (err) - printk(KERN_ERR "Failed to open serial line %d, err = %d\n", - tty->index, err); - - return err; + return line_install(driver, tty, &serial_lines[tty->index]); } static const struct tty_operations ssl_ops = { - .open = ssl_open, + .open = line_open, .close = line_close, .write = line_write, .put_char = line_put_char, @@ -110,6 +104,9 @@ static const struct tty_operations ssl_ops = { .set_termios = line_set_termios, .throttle = line_throttle, .unthrottle = line_unthrottle, + .install = ssl_install, + .cleanup = line_cleanup, + .hangup = line_hangup, }; /* Changed by ssl_init and referenced by ssl_exit, which are both serialized -- cgit v1.2.3