diff options
author | Alan Cox <alan@linux.intel.com> | 2010-09-16 13:21:52 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-22 13:20:05 -0400 |
commit | 0587102cf9f427c185bfdeb2cef41e13ee0264b1 (patch) | |
tree | 94c6dcc7ac230dee166d2f6aa1f9a54bffe5764b /arch/ia64 | |
parent | 0bca1b913affbd7e2fdaffee62a499659a466eb5 (diff) |
tty: icount changeover for other main devices
Again basically cut and paste
Convert the main driver set to use the hooks for GICOUNT
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch/ia64')
-rw-r--r-- | arch/ia64/hp/sim/simserial.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/arch/ia64/hp/sim/simserial.c b/arch/ia64/hp/sim/simserial.c index 1e8d71ad93ef..13633da0d3de 100644 --- a/arch/ia64/hp/sim/simserial.c +++ b/arch/ia64/hp/sim/simserial.c | |||
@@ -395,7 +395,7 @@ static int rs_ioctl(struct tty_struct *tty, struct file * file, | |||
395 | { | 395 | { |
396 | if ((cmd != TIOCGSERIAL) && (cmd != TIOCSSERIAL) && | 396 | if ((cmd != TIOCGSERIAL) && (cmd != TIOCSSERIAL) && |
397 | (cmd != TIOCSERCONFIG) && (cmd != TIOCSERGSTRUCT) && | 397 | (cmd != TIOCSERCONFIG) && (cmd != TIOCSERGSTRUCT) && |
398 | (cmd != TIOCMIWAIT) && (cmd != TIOCGICOUNT)) { | 398 | (cmd != TIOCMIWAIT)) { |
399 | if (tty->flags & (1 << TTY_IO_ERROR)) | 399 | if (tty->flags & (1 << TTY_IO_ERROR)) |
400 | return -EIO; | 400 | return -EIO; |
401 | } | 401 | } |
@@ -433,16 +433,6 @@ static int rs_ioctl(struct tty_struct *tty, struct file * file, | |||
433 | case TIOCMIWAIT: | 433 | case TIOCMIWAIT: |
434 | printk(KERN_INFO "rs_ioctl: TIOCMIWAIT: called\n"); | 434 | printk(KERN_INFO "rs_ioctl: TIOCMIWAIT: called\n"); |
435 | return 0; | 435 | return 0; |
436 | /* | ||
437 | * Get counter of input serial line interrupts (DCD,RI,DSR,CTS) | ||
438 | * Return: write counters to the user passed counter struct | ||
439 | * NB: both 1->0 and 0->1 transitions are counted except for | ||
440 | * RI where only 0->1 is counted. | ||
441 | */ | ||
442 | case TIOCGICOUNT: | ||
443 | printk(KERN_INFO "rs_ioctl: TIOCGICOUNT called\n"); | ||
444 | return 0; | ||
445 | |||
446 | case TIOCSERGWILD: | 436 | case TIOCSERGWILD: |
447 | case TIOCSERSWILD: | 437 | case TIOCSERSWILD: |
448 | /* "setserial -W" is called in Debian boot */ | 438 | /* "setserial -W" is called in Debian boot */ |