]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
staging: most: remove exclusive wait_queue
authorChristian Gromm <christian.gromm@microchip.com>
Wed, 28 Oct 2015 14:14:35 +0000 (15:14 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 28 Oct 2015 23:57:19 +0000 (08:57 +0900)
This patch removes the unnecessary wait_queue that has exclusively been
used for the poll function and its poll_table. Instead, an already
existing one is used.

Signed-off-by: Christian Gromm <christian.gromm@microchip.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/most/aim-cdev/cdev.c

index 4dd1434b80600a5f64ad84c6989d80a56d2387d5..dc3fb25b52aab246ba9c2d14cf7ca940be3e9e54 100644 (file)
@@ -32,7 +32,6 @@ static struct most_aim cdev_aim;
 
 struct aim_channel {
        wait_queue_head_t wq;
-       wait_queue_head_t poll_wq;
        struct cdev cdev;
        struct device *dev;
        struct mutex io_mutex;
@@ -283,7 +282,7 @@ static unsigned int aim_poll(struct file *filp, poll_table *wait)
        struct aim_channel *c = filp->private_data;
        unsigned int mask = 0;
 
-       poll_wait(filp, &c->poll_wq, wait);
+       poll_wait(filp, &c->wq, wait);
 
        if (c->cfg->direction == MOST_CH_RX) {
                if (!kfifo_is_empty(&c->fifo))
@@ -459,7 +458,6 @@ static int aim_probe(struct most_interface *iface, int channel_id,
                goto error_alloc_kfifo;
        }
        init_waitqueue_head(&channel->wq);
-       init_waitqueue_head(&channel->poll_wq);
        mutex_init(&channel->io_mutex);
        spin_lock_irqsave(&ch_list_lock, cl_flags);
        list_add_tail(&channel->list, &channel_list);