[Linux-kernel-commits] [9324] trunk/drivers/staging/iio/industrialio-core.c: merge from upstream: staging: iio: simplify logic in iio_interrupt_handler

[vapier]

Title: [9324] trunk/drivers/staging/iio/industrialio-core.c: merge from upstream: staging: iio: simplify logic in iio_interrupt_handler

Revision

9324

Author

vapier

Date

2010-10-24 16:39:10 -0400 (Sun, 24 Oct 2010)

Log Message

merge from upstream: staging: iio: simplify logic in iio_interrupt_handler

From: Jonathan Cameron <ji...@cam.ac.uk>

Signed-off-by: Jonathan Cameron <ji...@cam.ac.uk>
Acked-by: Manuel Stahl <manuel.st...@iis.fraunhofer.de>
Signed-off-by: Greg Kroah-Hartman <gre...@suse.de>

Modified Paths

• trunk/drivers/staging/iio/industrialio-core.c

Diff

Modified: trunk/drivers/staging/iio/industrialio-core.c (9323 => 9324)

--- trunk/drivers/staging/iio/industrialio-core.c	2010-10-24 20:39:05 UTC (rev 9323)
+++ trunk/drivers/staging/iio/industrialio-core.c	2010-10-24 20:39:10 UTC (rev 9324)
@@ -125,19 +125,10 @@
 	}
 
 	time_ns = iio_get_time_ns();
-	/* detect single element list*/
-	if (list_is_singular(&int_info->ev_list)) {
+	list_for_each_entry(p, &int_info->ev_list, list) {
 		disable_irq_nosync(irq);
-		p = list_first_entry(&int_info->ev_list,
-				     struct iio_event_handler_list,
-				     list);
-		/* single event handler - maybe shared */
 		p->handler(dev_info, 1, time_ns, !(p->refcount > 1));
-	} else
-		list_for_each_entry(p, &int_info->ev_list, list) {
-			disable_irq_nosync(irq);
-			p->handler(dev_info, 1, time_ns, 0);
-		}
+	}
 	spin_unlock_irqrestore(&int_info->ev_list_lock, flags);
 
 	return IRQ_HANDLED;

_______________________________________________
Linux-kernel-commits mailing list
Linux-kernel-commits@blackfin.uclinux.org
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits