]> err.no Git - linux-2.6/commitdiff
[PATCH] Remove long dead #if 0 code from rio_param
authorAlan Cox <alan@lxorguk.ukuu.org.uk>
Mon, 16 Jan 2006 17:10:23 +0000 (17:10 +0000)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 17 Jan 2006 07:31:27 +0000 (23:31 -0800)
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
drivers/char/rio/rioparam.c

index 4cc7f4942bfc969e2c4031fc7526fac365c08c55..c622f46d6d771d337650704fbe34636ed64dce56 100644 (file)
@@ -195,27 +195,6 @@ int SleepFlag;
                 ** paramed with OPEN, we want to restore the saved port termio, but
                 ** only if StoredTermio has been saved, i.e. NOT 1st open after reboot.
                 */
-#if 0
-               if (PortP->FirstOpen) {
-                       PortP->StoredTty.iflag = TtyP->tm.c_iflag;
-                       PortP->StoredTty.oflag = TtyP->tm.c_oflag;
-                       PortP->StoredTty.cflag = TtyP->tm.c_cflag;
-                       PortP->StoredTty.lflag = TtyP->tm.c_lflag;
-                       PortP->StoredTty.line = TtyP->tm.c_line;
-                       for (i = 0; i < NCC + 5; i++)
-                               PortP->StoredTty.cc[i] = TtyP->tm.c_cc[i];
-                       PortP->FirstOpen = 0;
-               } else if (PortP->Store || PortP->Lock) {
-                       rio_dprintk(RIO_DEBUG_PARAM, "OPEN: Restoring stored/locked params\n");
-                       TtyP->tm.c_iflag = PortP->StoredTty.iflag;
-                       TtyP->tm.c_oflag = PortP->StoredTty.oflag;
-                       TtyP->tm.c_cflag = PortP->StoredTty.cflag;
-                       TtyP->tm.c_lflag = PortP->StoredTty.lflag;
-                       TtyP->tm.c_line = PortP->StoredTty.line;
-                       for (i = 0; i < NCC + 5; i++)
-                               TtyP->tm.c_cc[i] = PortP->StoredTty.cc[i];
-               }
-#endif
        }
 
        /*
@@ -273,16 +252,6 @@ int SleepFlag;
        phb_param_ptr = (struct phb_param *) PacketP->data;
 
 
-#if 0
-       /*
-        ** COR 1
-        */
-       if (TtyP->tm.c_iflag & INPCK) {
-               rio_dprintk(RIO_DEBUG_PARAM, "Parity checking on input enabled\n");
-               Cor1 |= COR1_INPCK;
-       }
-#endif
-
        switch (TtyP->termios->c_cflag & CSIZE) {
        case CS5:
                {
@@ -523,10 +492,6 @@ int SleepFlag;
 #ifdef XMT1EN
        if (TtyP->termios->c_cflag & XMT1EN)
                rio_dprintk(RIO_DEBUG_PARAM, "XMT1EN (?)\n");
-#endif
-#if 0
-       if (TtyP->termios->c_cflag & LOBLK)
-               rio_dprintk(RIO_DEBUG_PARAM, "LOBLK - JCL output blocks when not current\n");
 #endif
        if (TtyP->termios->c_lflag & ISIG)
                rio_dprintk(RIO_DEBUG_PARAM, "Input character signal generating enabled\n");
@@ -572,14 +537,6 @@ int SleepFlag;
                rio_dprintk(RIO_DEBUG_PARAM, "Carriage return delay set\n");
        if (TtyP->termios->c_oflag & TABDLY)
                rio_dprintk(RIO_DEBUG_PARAM, "Tab delay set\n");
-#if 0
-       if (TtyP->termios->c_oflag & BSDLY)
-               rio_dprintk(RIO_DEBUG_PARAM, "Back-space delay set\n");
-       if (TtyP->termios->c_oflag & VTDLY)
-               rio_dprintk(RIO_DEBUG_PARAM, "Vertical tab delay set\n");
-       if (TtyP->termios->c_oflag & FFDLY)
-               rio_dprintk(RIO_DEBUG_PARAM, "Form-feed delay set\n");
-#endif
        /*
         ** These things are kind of useful in a later life!
         */