diff options
author | Jiri Slaby <jslaby@suse.cz> | 2012-08-07 15:47:27 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-08-10 16:27:50 -0400 |
commit | 3dd332c553996eec2593110b05abf8a4819b5c28 (patch) | |
tree | 8841ed6a19c4aa37f286051184d1e25f41707ac4 | |
parent | 6f9ea7ad7be10dca95e7ca57221c5f81be48d852 (diff) |
TTY: 68328serial, fix compilation
tty_struct->termios is no longer a pointer. This was changed recently
by "tty: move the termios object into the tty". But 68328serial was
not changed, so we now have a compilation error:
68328serial.c: In function 'change_speed':
68328serial.c:518:22: error: invalid type argument of '->' (have 'struct ktermios')
68328serial.c: In function 'rs_set_ldisc':
68328serial.c:620:31: error: invalid type argument of '->' (have 'struct ktermios')
68328serial.c: In function 'rs_set_termios':
68328serial.c:988:20: error: invalid type argument of '->' (have 'struct ktermios')
Fix that now.
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Acked-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/tty/serial/68328serial.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/tty/serial/68328serial.c b/drivers/tty/serial/68328serial.c index 3ed20e435e59..cc4c092fef06 100644 --- a/drivers/tty/serial/68328serial.c +++ b/drivers/tty/serial/68328serial.c | |||
@@ -515,7 +515,7 @@ static void change_speed(struct m68k_serial *info, struct tty_struct *tty) | |||
515 | unsigned cflag; | 515 | unsigned cflag; |
516 | int i; | 516 | int i; |
517 | 517 | ||
518 | cflag = tty->termios->c_cflag; | 518 | cflag = tty->termios.c_cflag; |
519 | if (!(port = info->port)) | 519 | if (!(port = info->port)) |
520 | return; | 520 | return; |
521 | 521 | ||
@@ -617,7 +617,7 @@ static void rs_set_ldisc(struct tty_struct *tty) | |||
617 | if (serial_paranoia_check(info, tty->name, "rs_set_ldisc")) | 617 | if (serial_paranoia_check(info, tty->name, "rs_set_ldisc")) |
618 | return; | 618 | return; |
619 | 619 | ||
620 | info->is_cons = (tty->termios->c_line == N_TTY); | 620 | info->is_cons = (tty->termios.c_line == N_TTY); |
621 | 621 | ||
622 | printk("ttyS%d console mode %s\n", info->line, info->is_cons ? "on" : "off"); | 622 | printk("ttyS%d console mode %s\n", info->line, info->is_cons ? "on" : "off"); |
623 | } | 623 | } |
@@ -985,7 +985,7 @@ static void rs_set_termios(struct tty_struct *tty, struct ktermios *old_termios) | |||
985 | change_speed(info, tty); | 985 | change_speed(info, tty); |
986 | 986 | ||
987 | if ((old_termios->c_cflag & CRTSCTS) && | 987 | if ((old_termios->c_cflag & CRTSCTS) && |
988 | !(tty->termios->c_cflag & CRTSCTS)) { | 988 | !(tty->termios.c_cflag & CRTSCTS)) { |
989 | tty->hw_stopped = 0; | 989 | tty->hw_stopped = 0; |
990 | rs_start(tty); | 990 | rs_start(tty); |
991 | } | 991 | } |
@@ -1070,7 +1070,7 @@ static void rs_close(struct tty_struct *tty, struct file * filp) | |||
1070 | if (tty->ldisc.close) | 1070 | if (tty->ldisc.close) |
1071 | (tty->ldisc.close)(tty); | 1071 | (tty->ldisc.close)(tty); |
1072 | tty->ldisc = ldiscs[N_TTY]; | 1072 | tty->ldisc = ldiscs[N_TTY]; |
1073 | tty->termios->c_line = N_TTY; | 1073 | tty->termios.c_line = N_TTY; |
1074 | if (tty->ldisc.open) | 1074 | if (tty->ldisc.open) |
1075 | (tty->ldisc.open)(tty); | 1075 | (tty->ldisc.open)(tty); |
1076 | } | 1076 | } |