[svn-commits] sruffell: linux/trunk r9990 - /linux/trunk/drivers/dahdi/dahdi-base.c

[SVN commits to the Digium repositories]

Author: sruffell
Date: Tue Jun 28 10:55:44 2011
New Revision: 9990

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=9990
Log:
Revert "dahdi: If a timer is not configured then we should block indefinitely."

This reverts commit r9937 and is part of two commits to revert all the timer
changes.

Grouping the timer into rates did not allow a timers rate to be changed after
another thread is already blocked on the poll call

Signed-off-by: Shaun Ruffell <sruffell at digium.com>
Acked-by: Russ Meyerriecks <rmeyerriecks at digium.com>

Modified:
    linux/trunk/drivers/dahdi/dahdi-base.c

Modified: linux/trunk/drivers/dahdi/dahdi-base.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/dahdi-base.c?view=diff&rev=9990&r1=9989&r2=9990
==============================================================================
--- linux/trunk/drivers/dahdi/dahdi-base.c (original)
+++ linux/trunk/drivers/dahdi/dahdi-base.c Tue Jun 28 10:55:44 2011
@@ -8751,39 +8751,13 @@
 	spin_unlock(&dahdi_timer_lock);
 }
 
-/**
- * dahdi_timer_poll - Poll function for a dahdi_timer.
- * @file:	Open timer handle.
- * @wait_table: Just passing through...
- *
- * Returns 0 if there isn't anything to wake us up, otherwise POLLPRI if there
- * is an event waiting on the timer.
- *
- * Older versions of Asterisk depend on the behavior that this poll will block
- * indefintely if the timer has not been configured, so if there is no rate
- * attached to the timer, this function must return 0.
- *
- */
-static unsigned int
-dahdi_timer_poll(struct file *file, struct poll_table_struct *wait_table)
+static unsigned int dahdi_timer_poll(struct file *file, struct poll_table_struct *wait_table)
 {
 	struct dahdi_timer *timer = file->private_data;
-	struct dahdi_timer_rate *rate;
-
-	if (!timer)
+	struct dahdi_timer_rate *rate = timer->rate;
+
+	if (!rate || !timer)
 		return -EINVAL;
-
-	rate = timer->rate;
-
-	if (!rate) {
-		static bool __once;
-		if (!__once) {
-			__once = true;
-			module_printk(KERN_NOTICE,
-				      "Calling poll on unconfigured timer.\n");
-		}
-		return 0;
-	}
 
 	poll_wait(file, &rate->sel, wait_table);
 	if (atomic_read(&timer->tripped) || atomic_read(&timer->ping))