summaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
authorSamuel Ortiz <sameo@linux.intel.com>2010-12-20 13:01:30 +0100
committerLinus Walleij <linus.walleij@stericsson.com>2010-12-20 13:32:26 +0100
commitabda3a24a99998279fe890ea8a789ebe4d605d78 (patch)
treebeb00103fec73ed6c3de52d1f79773fbe35fda28 /drivers/mfd
parent3c5728edbeb44819dba25a3c1b56702c87c9e419 (diff)
downloadlinux-abda3a24a99998279fe890ea8a789ebe4d605d78.tar.bz2
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>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/tc3589x.c13
1 files changed, 1 insertions, 12 deletions
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