From patchwork Sat Oct 10 20:00:57 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Hurley X-Patchwork-Id: 528651 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id A56941402B7 for ; Sun, 11 Oct 2015 07:02:15 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752789AbbJJUBx (ORCPT ); Sat, 10 Oct 2015 16:01:53 -0400 Received: from mail-qg0-f51.google.com ([209.85.192.51]:33009 "EHLO mail-qg0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752784AbbJJUBa (ORCPT ); Sat, 10 Oct 2015 16:01:30 -0400 Received: by qgew37 with SMTP id w37so36048669qge.0 for ; Sat, 10 Oct 2015 13:01:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=sJiL7WinnwEKWRX/5/g/EZdUm9QLhMOnoDGURyYD+xU=; b=H6u2+JiLd2pbMYdcHjZWqNd1Vi2fDxHqEK4IbINX7tvEh4xI6YIxp5Ml6mnK2sdaWu WhpHYWfKn6HxNpejVYB6Rv6qckpNooMI+2kknPpijiUaJI92ah2uyrIjK6c5JWDrS6lK NBvlYp55BGGUjth4aqu5w4iBOhSjGF4vT/pZi114MUUZnV252Nl1KHkqfj3TH9PthZAV hXVk3E35YUm/gdzJaNVNkgQvSvQzjldNOwMLT/4CVm6/rqPstN4/pkvJ5/A+QJo2dQlr wEzgvK+vQs3o33O5Uz4bBPPwgrwO0oncDXRLvTeGpxTdTd6GEnLN6m7/7SWWbfFUJ3oG TRMw== X-Gm-Message-State: ALoCoQl9MWGLDtZbOT1ZRjGXNfvvmxbyRX9bIjMcx6Nelx9glv0iWBwTNYG4MHywajPuiJvYyAFq X-Received: by 10.140.33.201 with SMTP id j67mr23182838qgj.49.1444507289375; Sat, 10 Oct 2015 13:01:29 -0700 (PDT) Received: from thor.lan (c-24-61-92-208.hsd1.nh.comcast.net. [24.61.92.208]) by smtp.gmail.com with ESMTPSA id 128sm3537536qhe.9.2015.10.10.13.01.28 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 10 Oct 2015 13:01:28 -0700 (PDT) From: Peter Hurley To: Greg Kroah-Hartman Cc: Jiri Slaby , Alan Cox , David Laight , Arnd Bergmann , linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org, netdev@vger.kernel.org, David Miller , Peter Hurley Subject: [PATCH 7/7] tty: Remove wait_event_interruptible_tty() Date: Sat, 10 Oct 2015 16:00:57 -0400 Message-Id: <1444507257-7513-8-git-send-email-peter@hurleysoftware.com> X-Mailer: git-send-email 2.6.1 In-Reply-To: <1444507257-7513-1-git-send-email-peter@hurleysoftware.com> References: <1444507257-7513-1-git-send-email-peter@hurleysoftware.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In-tree users of wait_event_interruptible_tty() have been removed; remove. Signed-off-by: Peter Hurley --- include/linux/tty.h | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/include/linux/tty.h b/include/linux/tty.h index 090ce2a..c2889f4 100644 --- a/include/linux/tty.h +++ b/include/linux/tty.h @@ -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 *);