diff options
author | Alan Cox <alan@lxorguk.ukuu.org.uk> | 2006-01-16 12:24:47 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-17 02:31:28 -0500 |
commit | 542ea6c37c2a77f7523c0703c326b8a9af2892bc (patch) | |
tree | fd06ec091cd3092244df56f13ed419e9cd23915a /drivers/char/rio/rio_linux.c | |
parent | 283c9d546ed7506b03f0d9da4441145aa5f2f6f9 (diff) |
[PATCH] Remove unused code from rio_linux.c
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/char/rio/rio_linux.c')
-rw-r--r-- | drivers/char/rio/rio_linux.c | 60 |
1 files changed, 0 insertions, 60 deletions
diff --git a/drivers/char/rio/rio_linux.c b/drivers/char/rio/rio_linux.c index 8825bd61b7d0..c9af283a811d 100644 --- a/drivers/char/rio/rio_linux.c +++ b/drivers/char/rio/rio_linux.c | |||
@@ -132,16 +132,6 @@ more than 512 ports.... */ | |||
132 | */ | 132 | */ |
133 | #define IRQ_RATE_LIMIT 200 | 133 | #define IRQ_RATE_LIMIT 200 |
134 | 134 | ||
135 | #if 0 | ||
136 | /* Not implemented */ | ||
137 | /* | ||
138 | * The following defines are mostly for testing purposes. But if you need | ||
139 | * some nice reporting in your syslog, you can define them also. | ||
140 | */ | ||
141 | #define RIO_REPORT_FIFO | ||
142 | #define RIO_REPORT_OVERRUN | ||
143 | #endif | ||
144 | |||
145 | 135 | ||
146 | /* These constants are derived from SCO Source */ | 136 | /* These constants are derived from SCO Source */ |
147 | static struct Conf | 137 | static struct Conf |
@@ -573,21 +563,6 @@ static void rio_shutdown_port(void *ptr) | |||
573 | 563 | ||
574 | PortP = (struct Port *) ptr; | 564 | PortP = (struct Port *) ptr; |
575 | PortP->gs.tty = NULL; | 565 | PortP->gs.tty = NULL; |
576 | #if 0 | ||
577 | port->gs.flags &= ~GS_ACTIVE; | ||
578 | if (!port->gs.tty) { | ||
579 | rio_dprintk(RIO_DBUG_TTY, "No tty.\n"); | ||
580 | return; | ||
581 | } | ||
582 | if (!port->gs.tty->termios) { | ||
583 | rio_dprintk(RIO_DEBUG_TTY, "No termios.\n"); | ||
584 | return; | ||
585 | } | ||
586 | if (port->gs.tty->termios->c_cflag & HUPCL) { | ||
587 | rio_setsignals(port, 0, 0); | ||
588 | } | ||
589 | #endif | ||
590 | |||
591 | func_exit(); | 566 | func_exit(); |
592 | } | 567 | } |
593 | 568 | ||
@@ -663,11 +638,6 @@ static int rio_ioctl(struct tty_struct *tty, struct file *filp, unsigned int cmd | |||
663 | 638 | ||
664 | rc = 0; | 639 | rc = 0; |
665 | switch (cmd) { | 640 | switch (cmd) { |
666 | #if 0 | ||
667 | case TIOCGSOFTCAR: | ||
668 | rc = put_user(((tty->termios->c_cflag & CLOCAL) ? 1 : 0), (unsigned int *) arg); | ||
669 | break; | ||
670 | #endif | ||
671 | case TIOCSSOFTCAR: | 641 | case TIOCSSOFTCAR: |
672 | if ((rc = get_user(ival, (unsigned int *) arg)) == 0) { | 642 | if ((rc = get_user(ival, (unsigned int *) arg)) == 0) { |
673 | tty->termios->c_cflag = (tty->termios->c_cflag & ~CLOCAL) | (ival ? CLOCAL : 0); | 643 | tty->termios->c_cflag = (tty->termios->c_cflag & ~CLOCAL) | (ival ? CLOCAL : 0); |
@@ -709,36 +679,6 @@ static int rio_ioctl(struct tty_struct *tty, struct file *filp, unsigned int cmd | |||
709 | if (access_ok(VERIFY_READ, (void *) arg, sizeof(struct serial_struct))) | 679 | if (access_ok(VERIFY_READ, (void *) arg, sizeof(struct serial_struct))) |
710 | rc = gs_setserial(&PortP->gs, (struct serial_struct *) arg); | 680 | rc = gs_setserial(&PortP->gs, (struct serial_struct *) arg); |
711 | break; | 681 | break; |
712 | #if 0 | ||
713 | /* | ||
714 | * note: these IOCTLs no longer reach here. Use | ||
715 | * tiocmset/tiocmget driver methods instead. The | ||
716 | * #if 0 disablement predates this comment. | ||
717 | */ | ||
718 | case TIOCMGET: | ||
719 | rc = -EFAULT; | ||
720 | if (access_ok(VERIFY_WRITE, (void *) arg, sizeof(unsigned int))) { | ||
721 | rc = 0; | ||
722 | ival = rio_getsignals(port); | ||
723 | put_user(ival, (unsigned int *) arg); | ||
724 | } | ||
725 | break; | ||
726 | case TIOCMBIS: | ||
727 | if ((rc = get_user(ival, (unsigned int *) arg)) == 0) { | ||
728 | rio_setsignals(port, ((ival & TIOCM_DTR) ? 1 : -1), ((ival & TIOCM_RTS) ? 1 : -1)); | ||
729 | } | ||
730 | break; | ||
731 | case TIOCMBIC: | ||
732 | if ((rc = get_user(ival, (unsigned int *) arg)) == 0) { | ||
733 | rio_setsignals(port, ((ival & TIOCM_DTR) ? 0 : -1), ((ival & TIOCM_RTS) ? 0 : -1)); | ||
734 | } | ||
735 | break; | ||
736 | case TIOCMSET: | ||
737 | if ((rc = get_user(ival, (unsigned int *) arg)) == 0) { | ||
738 | rio_setsignals(port, ((ival & TIOCM_DTR) ? 1 : 0), ((ival & TIOCM_RTS) ? 1 : 0)); | ||
739 | } | ||
740 | break; | ||
741 | #endif | ||
742 | default: | 682 | default: |
743 | rc = -ENOIOCTLCMD; | 683 | rc = -ENOIOCTLCMD; |
744 | break; | 684 | break; |