From patchwork Mon Nov 9 12:15:50 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Hurley X-Patchwork-Id: 541744 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 642AC1402CC for ; Mon, 9 Nov 2015 23:16:58 +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=1x23p9f8; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751666AbbKIMQm (ORCPT ); Mon, 9 Nov 2015 07:16:42 -0500 Received: from mail-io0-f178.google.com ([209.85.223.178]:33973 "EHLO mail-io0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751576AbbKIMQi (ORCPT ); Mon, 9 Nov 2015 07:16:38 -0500 Received: by iody8 with SMTP id y8so183203114iod.1 for ; Mon, 09 Nov 2015 04:16:37 -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=FMlY2alW6F5bZJ3Ngh3n5pqhARnnGBtoG1jj0zw4JEw=; b=1x23p9f8Xu5zr6LTOzJupsxOESLQVXBk+QU0gCqUinrsfZwh+sKsI1sKWhmY1WWL+3 RnoBlCxmsiv5aowt//DuJWVzYjYm1bF1D4chfe1fGOcjp/yw99zxTSSDxC7N+zuHemnU EsMwu5ajDuRdkg6H7e1taMZPEcwk9e21koPa9oiHLEzS4LUIH1sJ0gyRrQ0r1EXZzYJM g1t1iDSMOj9BDtpwnJqvC8Zsi6j0mMQmZc/ZHewnDbLczrs9PsCmaIKopRcjG85C2kmd mm9wYX8Zsp7OPMQjcrLD42MkF2aTbKOSc2GFzAM3GsfFxFeb14n6i/mumvx7xIjunlhg DNLQ== 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=FMlY2alW6F5bZJ3Ngh3n5pqhARnnGBtoG1jj0zw4JEw=; b=H25SIaDpo1fPoP3T3fxFxJDq0GH0K54m0AFkADuHfDFTVW4E9OTREdKXZ3ACbr7zWn HQMG3jvne29IOaW3YvbK5qowSiDxfFLhmjvCqMEh+kPE5EJjLssBkKlswgT1Jg/8Gw1I IHDZLLqNONQ2fqJkWhc2bv/K8/DIaEBRigY8cVEiP6AF9wyN7jFDidE9YLvbQMemXWFZ /5q72YSlt5NPtnnDaxz8LL62ao5W4nISnS3I4C0Arshb+GKOWrzYH7QOHix+n20P0fJm 6nelyLZgyK49MJwpjByUf82aaUrTFRTT5HCfSXgChAapepH6htx6K0TGfEkN3TQUGtT5 S12A== X-Gm-Message-State: ALoCoQloidobD2lTPwDNMrebCkekDGS8jrkBi9w0OCSaBcd0/mVEkqiN1WuqCcl74BevdikpeO0u X-Received: by 10.107.8.69 with SMTP id 66mr4420073ioi.34.1447071394926; Mon, 09 Nov 2015 04:16:34 -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.33 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 09 Nov 2015 04:16:34 -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 1/4] tty: rocket: Remove private close_wait Date: Mon, 9 Nov 2015 07:15:50 -0500 Message-Id: <1447071353-2961-2-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 This driver's private completion variable, close_wait, is no longer used for wait since "tty: Remove ASYNC_CLOSING checks in open()/hangup"; remove. Signed-off-by: Peter Hurley --- drivers/tty/rocket.c | 2 -- drivers/tty/rocket_int.h | 1 - 2 files changed, 3 deletions(-) diff --git a/drivers/tty/rocket.c b/drivers/tty/rocket.c index 802eac7..c5179f8 100644 --- a/drivers/tty/rocket.c +++ b/drivers/tty/rocket.c @@ -643,7 +643,6 @@ static void init_r_port(int board, int aiop, int chan, struct pci_dev *pci_dev) info->chan = chan; tty_port_init(&info->port); info->port.ops = &rocket_port_ops; - init_completion(&info->close_wait); info->flags &= ~ROCKET_MODE_MASK; switch (pc104[board][line]) { case 422: @@ -1049,7 +1048,6 @@ static void rp_close(struct tty_struct *tty, struct file *filp) mutex_unlock(&port->mutex); tty_port_tty_set(port, NULL); - complete_all(&info->close_wait); atomic_dec(&rp_num_ports_open); #ifdef ROCKET_DEBUG_OPEN diff --git a/drivers/tty/rocket_int.h b/drivers/tty/rocket_int.h index 67e0f1e..ef1e1be 100644 --- a/drivers/tty/rocket_int.h +++ b/drivers/tty/rocket_int.h @@ -1144,7 +1144,6 @@ struct r_port { int read_status_mask; int cps; - struct completion close_wait; /* Not yet matching the core */ spinlock_t slock; struct mutex write_mtx; };