summaryrefslogtreecommitdiff
path: root/include/linux/isdn.h
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2012-04-02 13:53:49 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-04-09 11:16:54 -0700
commit05eb48be91e6675c225b5f86c88ecbb83152119c (patch)
tree08bb2e98eca700f45884b93d43e4546f24948ce9 /include/linux/isdn.h
parent1ca6711ec001c1893552f1a90007f81dff57ca7a (diff)
downloadlinux-next-05eb48be91e6675c225b5f86c88ecbb83152119c.tar.gz
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>
Diffstat (limited to 'include/linux/isdn.h')
-rw-r--r--include/linux/isdn.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/isdn.h b/include/linux/isdn.h
index 292f27a793d4..d13b76df34b3 100644
--- 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;