Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1305832

[PATCH v2 1/9] tty: rocket: Remove private close_wait

Show all headers | View raw

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 <peter@hurleysoftware.com>
---
 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 f624b93..9dd02da 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;
 };
-- 
2.7.0

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 0/9] Misc tty fixes & cleanups Peter Hurley <peter@hurleysoftware.com> - 2016-01-11 05:40 +0100
  [PATCH v2 5/9] tty: Fix GPF in flush_to_ldisc(), part 2 Peter Hurley <peter@hurleysoftware.com> - 2016-01-11 05:40 +0100
  [PATCH v2 9/9] tty: Use test_bit() with tty->flags Peter Hurley <peter@hurleysoftware.com> - 2016-01-11 05:40 +0100
  [PATCH v2 1/9] tty: rocket: Remove private close_wait Peter Hurley <peter@hurleysoftware.com> - 2016-01-11 05:40 +0100
  [PATCH v2 6/9] tty: Unify receive_buf() code paths Peter Hurley <peter@hurleysoftware.com> - 2016-01-11 05:40 +0100
  [PATCH v2 3/9] ia64: Pin controlling tty for unaligned fault message Peter Hurley <peter@hurleysoftware.com> - 2016-01-11 05:40 +0100
  [PATCH v2 8/9] tty: Use termios c_*flag macros Peter Hurley <peter@hurleysoftware.com> - 2016-01-11 05:40 +0100
  [PATCH v2 2/9] n_tty: Ignore all read data when closing Peter Hurley <peter@hurleysoftware.com> - 2016-01-11 05:40 +0100

csiph-web