From: Samuel Ortiz <sameo@linux.intel.com>
Date: Mon, 20 Dec 2010 12:01:30 +0000 (+0100)
Subject: mfd: Use dummy_irq_chip for tc3589x
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=abda3a24a99998279fe890ea8a789ebe4d605d78;p=linux-beck.git

mfd: Use dummy_irq_chip for tc3589x

This also converts tc3589x to the new irq API.

Cc: Rabin Vincent <rabin.vincent@stericsson.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
---

diff --git a/drivers/mfd/tc3589x.c b/drivers/mfd/tc3589x.c
index 32291fe4151c..112efd3c4940 100644
--- a/drivers/mfd/tc3589x.c
+++ b/drivers/mfd/tc3589x.c
@@ -170,17 +170,6 @@ again:
 	return IRQ_HANDLED;
 }
 
-static void tc3589x_irq_dummy(unsigned int irq)
-{
-	/* No mask/unmask at this level */
-}
-
-static struct irq_chip tc3589x_irq_chip = {
-	.name	= "tc3589x",
-	.mask	= tc3589x_irq_dummy,
-	.unmask	= tc3589x_irq_dummy,
-};
-
 static int tc3589x_irq_init(struct tc3589x *tc3589x)
 {
 	int base = tc3589x->irq_base;
@@ -188,7 +177,7 @@ static int tc3589x_irq_init(struct tc3589x *tc3589x)
 
 	for (irq = base; irq < base + TC3589x_NR_INTERNAL_IRQS; irq++) {
 		set_irq_chip_data(irq, tc3589x);
-		set_irq_chip_and_handler(irq, &tc3589x_irq_chip,
+		set_irq_chip_and_handler(irq, &dummy_irq_chip,
 					 handle_edge_irq);
 		set_irq_nested_thread(irq, 1);
 #ifdef CONFIG_ARM