Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 95199
b: refs/heads/master
c: 92d30a9
h: refs/heads/master
i:
  95197: 1b406ac
  95195: ba08b55
  95191: e223072
  95183: 7f3b789
  95167: 513ef84
v: v3
  • Loading branch information
Jiri Slaby authored and Linus Torvalds committed Apr 30, 2008
1 parent a377ce5 commit fdbfb75
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 26 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: eaa95a8da6366c34d3a61e93109e5f8f8a4e72a0
refs/heads/master: 92d30a9372040a6411e6ed1234fea6153e750874
25 changes: 0 additions & 25 deletions trunk/drivers/char/moxa.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 *);
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit fdbfb75

Please sign in to comment.