From c27fc351cf4298b5ade8f3bda8f8be15af5d6cde Mon Sep 17 00:00:00 2001 From: Christian Gromm Date: Wed, 28 Oct 2015 15:14:35 +0100 Subject: [PATCH] staging: most: remove exclusive wait_queue 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 Signed-off-by: Greg Kroah-Hartman --- drivers/staging/most/aim-cdev/cdev.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/staging/most/aim-cdev/cdev.c b/drivers/staging/most/aim-cdev/cdev.c index 4dd1434b8060..dc3fb25b52aa 100644 --- a/drivers/staging/most/aim-cdev/cdev.c +++ b/drivers/staging/most/aim-cdev/cdev.c @@ -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); -- 2.39.5