]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
tty: rocket: Remove private close_wait
authorPeter Hurley <peter@hurleysoftware.com>
Mon, 11 Jan 2016 04:36:08 +0000 (20:36 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 28 Jan 2016 22:13:44 +0000 (14:13 -0800)
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/rocket.c
drivers/tty/rocket_int.h

index f624b93a237fd29658aaefda3a03baab5e79c152..9dd02daf45ca89174af168f0677e93df229f37e7 100644 (file)
@@ -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
index 67e0f1e778a23d4804de496d22759549966b914c..ef1e1be6b26d885a6efebc1fd45afec241e3977c 100644 (file)
@@ -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;
 };