From 707870899d9cd11b5142d89525fca199bf396aba Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Fri, 25 Mar 2011 11:12:31 +0000
Subject: [PATCH] --- yaml --- r: 242951 b: refs/heads/master c:
 c22435a307e00b8ae947b79a8c0d94ab0bef404c h: refs/heads/master i:   242949:
 7cd4dca3e27bfb5f02256299d34f3b52da407278   242947:
 b91944b7941ee5e9ff8bb936ff2961e28959ba22   242943:
 692b4e33f6a74363a1a857aeb81eca632af82a77 v: v3

---
 [refs]                          |  2 +-
 trunk/drivers/mfd/twl6030-irq.c | 17 +----------------
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index 2dce0c54c94a..2c27a5ed1361 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d740f4523bb4aea24bece704c726c69094e20d00
+refs/heads/master: c22435a307e00b8ae947b79a8c0d94ab0bef404c
diff --git a/trunk/drivers/mfd/twl6030-irq.c b/trunk/drivers/mfd/twl6030-irq.c
index 4082ed73613f..3b9c7756cb6d 100644
--- a/trunk/drivers/mfd/twl6030-irq.c
+++ b/trunk/drivers/mfd/twl6030-irq.c
@@ -140,22 +140,7 @@ static int twl6030_irq_thread(void *data)
 			if (sts.int_sts & 0x1) {
 				int module_irq = twl6030_irq_base +
 					twl6030_interrupt_mapping[i];
-				struct irq_desc *d = irq_to_desc(module_irq);
-
-				if (!d) {
-					pr_err("twl6030: Invalid SIH IRQ: %d\n",
-					       module_irq);
-					return -EINVAL;
-				}
-
-				/* These can't be masked ... always warn
-				 * if we get any surprises.
-				 */
-				if (d->status & IRQ_DISABLED)
-					note_interrupt(module_irq, d,
-							IRQ_NONE);
-				else
-					d->handle_irq(module_irq, d);
+				generic_handle_irq(module_irq);
 
 			}
 		local_irq_enable();