From patchwork Mon Nov 9 12:15:53 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Hurley X-Patchwork-Id: 541747 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 CDEE21402C8 for ; Mon, 9 Nov 2015 23:18:01 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=hurleysoftware_com.20150623.gappssmtp.com header.i=@hurleysoftware_com.20150623.gappssmtp.com header.b=p+Wfx8Uq; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751784AbbKIMRB (ORCPT ); Mon, 9 Nov 2015 07:17:01 -0500 Received: from mail-io0-f169.google.com ([209.85.223.169]:32850 "EHLO mail-io0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751627AbbKIMQk (ORCPT ); Mon, 9 Nov 2015 07:16:40 -0500 Received: by iodd200 with SMTP id d200so183689738iod.0 for ; Mon, 09 Nov 2015 04:16:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hurleysoftware_com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=kMhURxNeEpx2+grI7+KoCnMspIdA/wHQnPogdpEJj9s=; b=p+Wfx8UqwEPrQpyAs5V6PLx0DKaqrS73WWFXCvTDsS/wVzonGWjLpOJ4MY229meAcT tbvGTM5pT26Ny6zvgNdDbwJ665/ugGGCH300qFosslRxayjwAobs1AMMuL9sAAEuHbHG Ujj2Icb4eIhYdSs4xMw25R/UJK1hArtLGHUzCA7OiHEGvQ4QDgs4q0vV1UaIrs453BOT D9GTPUgY6oJBi3DX1G3P+Y2Jfjv3YQLOEYqQnOpmHvWiNG93o5b0HArmSC4wGxRH631C wg2f7b6KSMGQJmMnI/D5Tx01jiSqHIUHCXRnV51hMofYcIO3e7q5K/o1FM++SR/yhTQZ i25g== 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=kMhURxNeEpx2+grI7+KoCnMspIdA/wHQnPogdpEJj9s=; b=C6V6QF7vTdbrbJN93XZDV9hcPAJ1b1t8UBSTbuH8oODHbMZlILoDAD43lbVREAJNKd WN+Kgu5zOGo6H0HGKf6zVlhJmXKbVoMuUTHGL29c7KqRxBN3IlX69eEZdgIvbrV7yRsn aB7ZeWzRCKuUnBAmtoq8AHaD1Qw4Xh9rkZcEmm4ihzOEnbZ4Yu9H+Gr1yY73lGUura5U Gl52tghmNQEOC4cjmDZkXzFMZnDDqEp+hw/9EcdugeEc9EBLDKeyjRkzir3zhMBjywmh O3xc4J+nLRNAuBjllSEaIXbsl81ChgUbTQnUj6/A3P6wlPd49qxpDXnfKcsMeMt3GaPr Dmgw== X-Gm-Message-State: ALoCoQmkVwbG9Mingj7F5N0kojUvxoo5EhGF1YPFj7lTEvDwr4rQHWBpVNAAfDvdAMQVV+ASqKwp X-Received: by 10.107.132.97 with SMTP id g94mr11110005iod.110.1447071399433; Mon, 09 Nov 2015 04:16:39 -0800 (PST) Received: from thor.lan (cpe-76-190-194-55.neo.res.rr.com. [76.190.194.55]) by smtp.gmail.com with ESMTPSA id z6sm1355203ign.1.2015.11.09.04.16.38 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 09 Nov 2015 04:16:38 -0800 (PST) From: Peter Hurley To: Greg Kroah-Hartman Cc: Jiri Slaby , linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org, netdev@vger.kernel.org, Johannes Stezenbach , Karsten Keil , Martin Schwidefsky , Heiko Carstens , Jesper Nilsson , Mikael Starvik , Jiri Kosina , David Sterba , Mark Hounschell , Peter Hurley Subject: [PATCH v2 4/4] tty: Remove drivers' extra tty_ldisc_flush() Date: Mon, 9 Nov 2015 07:15:53 -0500 Message-Id: <1447071353-2961-5-git-send-email-peter@hurleysoftware.com> X-Mailer: git-send-email 2.6.3 In-Reply-To: <1447071353-2961-1-git-send-email-peter@hurleysoftware.com> References: <1447020173-32207-1-git-send-email-peter@hurleysoftware.com> <1447071353-2961-1-git-send-email-peter@hurleysoftware.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The tty_port_close_start() helper already flushes the tty and ldisc buffers on final close; tty drivers which use this helper need not repeat tty_ldisc_flush(). Signed-off-by: Peter Hurley --- drivers/char/pcmcia/synclink_cs.c | 3 --- drivers/tty/amiserial.c | 2 -- drivers/tty/rocket.c | 2 -- drivers/tty/serial/serial_core.c | 2 -- drivers/tty/synclink.c | 1 - drivers/tty/synclink_gt.c | 1 - drivers/tty/synclinkmp.c | 1 - drivers/tty/tty_port.c | 2 -- 8 files changed, 14 deletions(-) diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c index 45df4bf..3f74677 100644 --- a/drivers/char/pcmcia/synclink_cs.c +++ b/drivers/char/pcmcia/synclink_cs.c @@ -2354,10 +2354,7 @@ static void mgslpc_close(struct tty_struct *tty, struct file * filp) mgslpc_wait_until_sent(tty, info->timeout); mgslpc_flush_buffer(tty); - - tty_ldisc_flush(tty); shutdown(info, tty); - tty_port_close_end(port, tty); tty_port_tty_set(port, NULL); cleanup: diff --git a/drivers/tty/amiserial.c b/drivers/tty/amiserial.c index 2caaf5a..bffc0a4 100644 --- a/drivers/tty/amiserial.c +++ b/drivers/tty/amiserial.c @@ -1420,8 +1420,6 @@ static void rs_close(struct tty_struct *tty, struct file * filp) } shutdown(tty, state); rs_flush_buffer(tty); - - tty_ldisc_flush(tty); port->tty = NULL; tty_port_close_end(port, tty); diff --git a/drivers/tty/rocket.c b/drivers/tty/rocket.c index a6b5ce0..5905200 100644 --- a/drivers/tty/rocket.c +++ b/drivers/tty/rocket.c @@ -1022,8 +1022,6 @@ static void rp_close(struct tty_struct *tty, struct file *filp) sClrDTR(cp); rp_flush_buffer(tty); - - tty_ldisc_flush(tty); clear_bit((info->aiop * 8) + info->chan, (void *) &xmit_flags[info->board]); diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c index db27a40..418587f 100644 --- a/drivers/tty/serial/serial_core.c +++ b/drivers/tty/serial/serial_core.c @@ -1439,8 +1439,6 @@ static void uart_close(struct tty_struct *tty, struct file *filp) wake_up_interruptible(&port->open_wait); mutex_unlock(&port->mutex); - - tty_ldisc_flush(tty); } static void uart_wait_until_sent(struct tty_struct *tty, int timeout) diff --git a/drivers/tty/synclink.c b/drivers/tty/synclink.c index 6188059..1334498 100644 --- a/drivers/tty/synclink.c +++ b/drivers/tty/synclink.c @@ -3099,7 +3099,6 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp) if (info->port.flags & ASYNC_INITIALIZED) mgsl_wait_until_sent(tty, info->timeout); mgsl_flush_buffer(tty); - tty_ldisc_flush(tty); shutdown(info); mutex_unlock(&info->port.mutex); diff --git a/drivers/tty/synclink_gt.c b/drivers/tty/synclink_gt.c index 5505ea8..1987fb4 100644 --- a/drivers/tty/synclink_gt.c +++ b/drivers/tty/synclink_gt.c @@ -729,7 +729,6 @@ static void close(struct tty_struct *tty, struct file *filp) if (info->port.flags & ASYNC_INITIALIZED) wait_until_sent(tty, info->timeout); flush_buffer(tty); - tty_ldisc_flush(tty); shutdown(info); mutex_unlock(&info->port.mutex); diff --git a/drivers/tty/synclinkmp.c b/drivers/tty/synclinkmp.c index fb00a06..fb17dac 100644 --- a/drivers/tty/synclinkmp.c +++ b/drivers/tty/synclinkmp.c @@ -816,7 +816,6 @@ static void close(struct tty_struct *tty, struct file *filp) wait_until_sent(tty, info->timeout); flush_buffer(tty); - tty_ldisc_flush(tty); shutdown(info); mutex_unlock(&info->port.mutex); diff --git a/drivers/tty/tty_port.c b/drivers/tty/tty_port.c index ecb6435..c30525a 100644 --- a/drivers/tty/tty_port.c +++ b/drivers/tty/tty_port.c @@ -503,8 +503,6 @@ void tty_port_close_end(struct tty_port *port, struct tty_struct *tty) { unsigned long flags; - tty_ldisc_flush(tty); - spin_lock_irqsave(&port->lock, flags); if (port->blocked_open) {