From: Jiri Slaby Date: Wed, 30 Apr 2008 07:53:47 +0000 (-0700) Subject: Char: moxa, remove useless tty functions X-Git-Tag: v2.6.26-rc1~217 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92d30a9372040a6411e6ed1234fea6153e750874;p=linux-2.6 Char: moxa, remove useless tty functions - moxa_flush_chars -- no code; ldics handle this well - moxa_put_char -- only wrapper to moxa_write (same code), tty does this the same way if tty->driver->put_char is NULL Signed-off-by: Jiri Slaby Tested-by: Oyvind Aabling Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/drivers/char/moxa.c b/drivers/char/moxa.c index 876c79b1ce..7f8773523f 100644 --- a/drivers/char/moxa.c +++ b/drivers/char/moxa.c @@ -193,8 +193,6 @@ static int moxa_write(struct tty_struct *, const unsigned char *, int); static int moxa_write_room(struct tty_struct *); static void moxa_flush_buffer(struct tty_struct *); static int moxa_chars_in_buffer(struct tty_struct *); -static void moxa_flush_chars(struct tty_struct *); -static void moxa_put_char(struct tty_struct *, unsigned char); static void moxa_throttle(struct tty_struct *); static void moxa_unthrottle(struct tty_struct *); static void moxa_set_termios(struct tty_struct *, struct ktermios *); @@ -391,8 +389,6 @@ static const struct tty_operations moxa_ops = { .write_room = moxa_write_room, .flush_buffer = moxa_flush_buffer, .chars_in_buffer = moxa_chars_in_buffer, - .flush_chars = moxa_flush_chars, - .put_char = moxa_put_char, .ioctl = moxa_ioctl, .throttle = moxa_throttle, .unthrottle = moxa_unthrottle, @@ -1284,27 +1280,6 @@ static int moxa_chars_in_buffer(struct tty_struct *tty) return chars; } -static void moxa_flush_chars(struct tty_struct *tty) -{ - /* - * Don't think I need this, because this is called to empty the TX - * buffer for the 16450, 16550, etc. - */ -} - -static void moxa_put_char(struct tty_struct *tty, unsigned char c) -{ - struct moxa_port *ch = tty->driver_data; - - if (ch == NULL) - return; - spin_lock_bh(&moxa_lock); - MoxaPortWriteData(ch, &c, 1); - spin_unlock_bh(&moxa_lock); - - ch->statusflags |= LOWWAIT; -} - static int moxa_tiocmget(struct tty_struct *tty, struct file *file) { struct moxa_port *ch;