UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

TTY: simserial, stop using serial_state->{line,icount} 

* instead of line, use tty->index or an iterator
* icount is not made public, only the tx path increments it

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jiri Slaby 2012-03-05 14:52:30 +01:00 committed by Greg Kroah-Hartman
parent d88405d44f
commit 98e3a9e6dd
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
arch/ia64/hp/sim/simserial.c
View File

@ -176,7 +176,6 @@ static void transmit_chars(struct tty_struct *tty, struct serial_state *info,
console->write(console, &c, 1);
info->icount.tx++;
info->x_char = 0;
goto out;
@ -478,7 +477,7 @@ static void rs_close(struct tty_struct *tty, struct file * filp)
}
if (--info->tport.count < 0) {
printk(KERN_ERR "rs_close: bad serial port count for ttys%d: %d\n",
info->line, info->tport.count);
tty->index, info->tport.count);
info->tport.count = 0;
}
if (info->tport.count) {
@ -669,19 +668,14 @@ static int rs_open(struct tty_struct *tty, struct file * filp)
* /proc fs routines....
*/
static inline void line_info(struct seq_file *m, struct serial_state *state)
{
seq_printf(m, "%d: uart:16550 port:3F8 irq:%d\n",
state->line, state->irq);
}
static int rs_proc_show(struct seq_file *m, void *v)
{
int i;
seq_printf(m, "simserinfo:1.0 driver:%s\n", serial_version);
for (i = 0; i < NR_PORTS; i++)
line_info(m, &rs_table[i]);
seq_printf(m, "%d: uart:16550 port:3F8 irq:%d\n",
i, rs_table[i].irq);
return 0;
}
@ -786,8 +780,7 @@ static int __init simrs_init(void)
state->irq = retval;
/* the port is imaginary */
printk(KERN_INFO "ttyS%d at 0x03f8 (irq = %d) is a 16550\n",
state->line, state->irq);
printk(KERN_INFO "ttyS0 at 0x03f8 (irq = %d) is a 16550\n", state->irq);
retval = tty_register_driver(hp_simserial_driver);
if (retval) {