]> git.ipfire.org Git - people/arne_f/kernel.git/commitdiff
tty: Remove wait_event_interruptible_tty()
authorPeter Hurley <peter@hurleysoftware.com>
Sat, 10 Oct 2015 20:00:57 +0000 (16:00 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 18 Oct 2015 04:11:29 +0000 (21:11 -0700)
In-tree users of wait_event_interruptible_tty() have been removed;
remove.

Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
include/linux/tty.h

index 090ce2a522626d445b695bd3cee53cfddb5a03ec..c2889f4331e1c4767a2549f6da198772ea8431dc 100644 (file)
@@ -655,32 +655,6 @@ extern void __lockfunc tty_unlock(struct tty_struct *tty);
 extern void __lockfunc tty_lock_slave(struct tty_struct *tty);
 extern void __lockfunc tty_unlock_slave(struct tty_struct *tty);
 extern void tty_set_lock_subclass(struct tty_struct *tty);
-/*
- * wait_event_interruptible_tty -- wait for a condition with the tty lock held
- *
- * The condition we are waiting for might take a long time to
- * become true, or might depend on another thread taking the
- * BTM. In either case, we need to drop the BTM to guarantee
- * forward progress. This is a leftover from the conversion
- * from the BKL and should eventually get removed as the BTM
- * falls out of use.
- *
- * Do not use in new code.
- */
-#define wait_event_interruptible_tty(tty, wq, condition)               \
-({                                                                     \
-       int __ret = 0;                                                  \
-       if (!(condition))                                               \
-               __ret = __wait_event_interruptible_tty(tty, wq,         \
-                                                      condition);      \
-       __ret;                                                          \
-})
-
-#define __wait_event_interruptible_tty(tty, wq, condition)             \
-       ___wait_event(wq, condition, TASK_INTERRUPTIBLE, 0, 0,          \
-                       tty_unlock(tty);                                \
-                       schedule();                                     \
-                       tty_lock(tty))
 
 #ifdef CONFIG_PROC_FS
 extern void proc_tty_register_driver(struct tty_driver *);