TTY: isdn, remove callout

I wonder how this survived there during the whole 2.6 series until now
:D.

Callouts are not used for a decade, so let us remove it also from
isdn. This means removal of ISDN_ASYNC_CALLOUT_ACTIVE which is never
raised in info->flags and callout_termios which are never used.

This will help us to get rid of ISDN_ASYNC_* flags and use ASYNC ones
from serial.h. And then we will switch to tty_port.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Karsten Keil <isdn@linux-pingi.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
index 1d701cd6031b925cbf035cab572e5b287c25a5fa..27f70923c224eb4674c589fa9b1b02614fdcd35b 100644 (file)
--- a/drivers/isdn/i4l/isdn_tty.c
+++ b/drivers/isdn/i4l/isdn_tty.c
@@ -1504,18 +1504,11 @@ isdn_tty_block_til_ready(struct tty_struct *tty, struct file *filp, modem_info *
         */
        if ((filp->f_flags & O_NONBLOCK) ||
            (tty->flags & (1 << TTY_IO_ERROR))) {
-               if (info->flags & ISDN_ASYNC_CALLOUT_ACTIVE)
-                       return -EBUSY;
                info->flags |= ISDN_ASYNC_NORMAL_ACTIVE;
                return 0;
        }
-       if (info->flags & ISDN_ASYNC_CALLOUT_ACTIVE) {
-               if (info->normal_termios.c_cflag & CLOCAL)
-                       do_clocal = 1;
-       } else {
-               if (tty->termios->c_cflag & CLOCAL)
-                       do_clocal = 1;
-       }
+       if (tty->termios->c_cflag & CLOCAL)
+               do_clocal = 1;
        /*
         * Block waiting for the carrier detect and the line to become
         * free (i.e., not in use by the callout).  While we are in
@@ -1546,8 +1539,7 @@ isdn_tty_block_til_ready(struct tty_struct *tty, struct file *filp, modem_info *
 #endif
                        break;
                }
-               if (!(info->flags & ISDN_ASYNC_CALLOUT_ACTIVE) &&
-                   !(info->flags & ISDN_ASYNC_CLOSING) &&
+               if (!(info->flags & ISDN_ASYNC_CLOSING) &&
                    (do_clocal || (info->msr & UART_MSR_DCD))) {
                        break;
                }
@@ -1670,14 +1662,6 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
                return;
        }
        info->flags |= ISDN_ASYNC_CLOSING;
-       /*
-        * Save the termios structure, since this port may have
-        * separate termios for callout and dialin.
-        */
-       if (info->flags & ISDN_ASYNC_NORMAL_ACTIVE)
-               info->normal_termios = *tty->termios;
-       if (info->flags & ISDN_ASYNC_CALLOUT_ACTIVE)
-               info->callout_termios = *tty->termios;
 
        tty->closing = 1;
        /*
@@ -1731,7 +1715,7 @@ isdn_tty_hangup(struct tty_struct *tty)
                return;
        isdn_tty_shutdown(info);
        info->count = 0;
-       info->flags &= ~(ISDN_ASYNC_NORMAL_ACTIVE | ISDN_ASYNC_CALLOUT_ACTIVE);
+       info->flags &= ~ISDN_ASYNC_NORMAL_ACTIVE;
        info->tty = NULL;
        wake_up_interruptible(&info->open_wait);
 }
@@ -2116,8 +2100,7 @@ isdn_tty_find_icall(int di, int ch, setup_parm *setup)
        return (wret == 2) ? 3 : 0;
 }
 
-#define TTY_IS_ACTIVE(info)                                            \
-       (info->flags & (ISDN_ASYNC_NORMAL_ACTIVE | ISDN_ASYNC_CALLOUT_ACTIVE))
+#define TTY_IS_ACTIVE(info)    (info->flags & ISDN_ASYNC_NORMAL_ACTIVE)
 
 int
 isdn_tty_stat_callback(int i, isdn_ctrl *c)
@@ -2628,11 +2611,8 @@ isdn_tty_modem_result(int code, modem_info *info)
                if ((info->flags & ISDN_ASYNC_CLOSING) || (!info->tty)) {
                        return;
                }
-               if ((info->flags & ISDN_ASYNC_CHECK_CD) &&
-                   (!((info->flags & ISDN_ASYNC_CALLOUT_ACTIVE) &&
-                      (info->flags & ISDN_ASYNC_CALLOUT_NOHUP)))) {
+               if (info->flags & ISDN_ASYNC_CHECK_CD)
                        tty_hangup(info->tty);
-               }
        }
 }
 

diff --git a/include/linux/isdn.h b/include/linux/isdn.h
index 292f27a793d4c270b8b2393d3d677f978e954b14..d13b76df34b3c6e600c15aa0841279c82d11852b 100644 (file)
--- a/include/linux/isdn.h
+++ b/include/linux/isdn.h
@@ -393,7 +393,6 @@ typedef struct isdn_net_dev_s {
 
 #define ISDN_ASYNC_MAGIC          0x49344C01 /* for paranoia-checking        */
 #define ISDN_ASYNC_INITIALIZED   0x80000000 /* port was initialized         */
-#define ISDN_ASYNC_CALLOUT_ACTIVE 0x40000000 /* Call out device active       */
 #define ISDN_ASYNC_NORMAL_ACTIVE  0x20000000 /* Normal device active         */
 #define ISDN_ASYNC_CLOSING       0x08000000 /* Serial port is closing       */
 #define ISDN_ASYNC_CTS_FLOW      0x04000000 /* Do CTS flow control          */
@@ -498,8 +497,6 @@ typedef struct modem_info {
 #endif
   struct tty_struct    *tty;            /* Pointer to corresponding tty   */
   atemu                 emu;             /* AT-emulator data               */
-  struct ktermios      normal_termios;  /* For saving termios structs     */
-  struct ktermios      callout_termios;
   wait_queue_head_t    open_wait, close_wait;
   spinlock_t           readlock;
 } modem_info;