diff options
author | Jiri Slaby <jirislaby@gmail.com> | 2008-04-30 03:53:47 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-30 11:29:43 -0400 |
commit | 92d30a9372040a6411e6ed1234fea6153e750874 (patch) | |
tree | 52684fb356dfd803e4519cebb792603f02cb2d80 | |
parent | eaa95a8da6366c34d3a61e93109e5f8f8a4e72a0 (diff) |
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 <jirislaby@gmail.com>
Tested-by: Oyvind Aabling <Oyvind.Aabling@uni-c.dk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | drivers/char/moxa.c | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/drivers/char/moxa.c b/drivers/char/moxa.c index 876c79b1cee..7f8773523fb 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); | |||
193 | static int moxa_write_room(struct tty_struct *); | 193 | static int moxa_write_room(struct tty_struct *); |
194 | static void moxa_flush_buffer(struct tty_struct *); | 194 | static void moxa_flush_buffer(struct tty_struct *); |
195 | static int moxa_chars_in_buffer(struct tty_struct *); | 195 | static int moxa_chars_in_buffer(struct tty_struct *); |
196 | static void moxa_flush_chars(struct tty_struct *); | ||
197 | static void moxa_put_char(struct tty_struct *, unsigned char); | ||
198 | static void moxa_throttle(struct tty_struct *); | 196 | static void moxa_throttle(struct tty_struct *); |
199 | static void moxa_unthrottle(struct tty_struct *); | 197 | static void moxa_unthrottle(struct tty_struct *); |
200 | static void moxa_set_termios(struct tty_struct *, struct ktermios *); | 198 | static void moxa_set_termios(struct tty_struct *, struct ktermios *); |
@@ -391,8 +389,6 @@ static const struct tty_operations moxa_ops = { | |||
391 | .write_room = moxa_write_room, | 389 | .write_room = moxa_write_room, |
392 | .flush_buffer = moxa_flush_buffer, | 390 | .flush_buffer = moxa_flush_buffer, |
393 | .chars_in_buffer = moxa_chars_in_buffer, | 391 | .chars_in_buffer = moxa_chars_in_buffer, |
394 | .flush_chars = moxa_flush_chars, | ||
395 | .put_char = moxa_put_char, | ||
396 | .ioctl = moxa_ioctl, | 392 | .ioctl = moxa_ioctl, |
397 | .throttle = moxa_throttle, | 393 | .throttle = moxa_throttle, |
398 | .unthrottle = moxa_unthrottle, | 394 | .unthrottle = moxa_unthrottle, |
@@ -1284,27 +1280,6 @@ static int moxa_chars_in_buffer(struct tty_struct *tty) | |||
1284 | return chars; | 1280 | return chars; |
1285 | } | 1281 | } |
1286 | 1282 | ||
1287 | static void moxa_flush_chars(struct tty_struct *tty) | ||
1288 | { | ||
1289 | /* | ||
1290 | * Don't think I need this, because this is called to empty the TX | ||
1291 | * buffer for the 16450, 16550, etc. | ||
1292 | */ | ||
1293 | } | ||
1294 | |||
1295 | static void moxa_put_char(struct tty_struct *tty, unsigned char c) | ||
1296 | { | ||
1297 | struct moxa_port *ch = tty->driver_data; | ||
1298 | |||
1299 | if (ch == NULL) | ||
1300 | return; | ||
1301 | spin_lock_bh(&moxa_lock); | ||
1302 | MoxaPortWriteData(ch, &c, 1); | ||
1303 | spin_unlock_bh(&moxa_lock); | ||
1304 | |||
1305 | ch->statusflags |= LOWWAIT; | ||
1306 | } | ||
1307 | |||
1308 | static int moxa_tiocmget(struct tty_struct *tty, struct file *file) | 1283 | static int moxa_tiocmget(struct tty_struct *tty, struct file *file) |
1309 | { | 1284 | { |
1310 | struct moxa_port *ch; | 1285 | struct moxa_port *ch; |