From e26a4d25c876faa780fa7c95936ea5bdf6f053be Mon Sep 17 00:00:00 2001 From: Shaun Ruffell Date: Tue, 21 Dec 2010 16:09:31 +0000 Subject: [PATCH] dahdi: Cleanup in the dahdi_chan_poll function. Signed-off-by: Shaun Ruffell Acked-by: Russ Meyerreicks git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@9550 a0bf4364-ded3-4de4-8d8a-66a801d63aff --- drivers/dahdi/dahdi-base.c | 38 ++++++++++++++------------------------ 1 file changed, 14 insertions(+), 24 deletions(-) diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c index f26eab9..adf31c3 100644 --- a/drivers/dahdi/dahdi-base.c +++ b/drivers/dahdi/dahdi-base.c @@ -8189,32 +8189,22 @@ static unsigned int dahdi_timer_poll(struct file *file, struct poll_table_struct static unsigned int dahdi_chan_poll(struct file *file, struct poll_table_struct *wait_table) { - - struct dahdi_chan *const chan = file->private_data; - int ret; + struct dahdi_chan *const c = file->private_data; + int ret = 0; unsigned long flags; - /* do the poll wait */ - if (chan) { - poll_wait(file, &chan->waitq, wait_table); - ret = 0; /* start with nothing to return */ - spin_lock_irqsave(&chan->lock, flags); - /* if at least 1 write buffer avail */ - if (chan->inwritebuf > -1) { - ret |= POLLOUT | POLLWRNORM; - } - if ((chan->outreadbuf > -1) && !chan->rxdisable) { - ret |= POLLIN | POLLRDNORM; - } - if (chan->eventoutidx != chan->eventinidx) - { - /* Indicate an exception */ - ret |= POLLPRI; - } - spin_unlock_irqrestore(&chan->lock, flags); - } else - ret = -EINVAL; - return(ret); /* return what we found */ + if (unlikely(!c)) + return -EINVAL; + + poll_wait(file, &c->waitq, wait_table); + + spin_lock_irqsave(&c->lock, flags); + ret |= (c->inwritebuf > -1) ? POLLOUT|POLLWRNORM : 0; + ret |= ((c->outreadbuf > -1) && !c->rxdisable) ? POLLIN|POLLRDNORM : 0; + ret |= (c->eventoutidx != c->eventinidx) ? POLLPRI : 0; + spin_unlock_irqrestore(&c->lock, flags); + + return ret; } static unsigned int dahdi_poll(struct file *file, struct poll_table_struct *wait_table)