diff options
author | Samuel Ortiz <sameo@linux.intel.com> | 2010-12-20 07:01:30 -0500 |
---|---|---|
committer | Linus Walleij <linus.walleij@stericsson.com> | 2010-12-20 07:32:26 -0500 |
commit | abda3a24a99998279fe890ea8a789ebe4d605d78 (patch) | |
tree | beb00103fec73ed6c3de52d1f79773fbe35fda28 /drivers/mfd/tc3589x.c | |
parent | 3c5728edbeb44819dba25a3c1b56702c87c9e419 (diff) |
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/tc3589x.c')
-rw-r--r-- | drivers/mfd/tc3589x.c | 13 |
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: | |||
170 | return IRQ_HANDLED; | 170 | return IRQ_HANDLED; |
171 | } | 171 | } |
172 | 172 | ||
173 | static void tc3589x_irq_dummy(unsigned int irq) | ||
174 | { | ||
175 | /* No mask/unmask at this level */ | ||
176 | } | ||
177 | |||
178 | static struct irq_chip tc3589x_irq_chip = { | ||
179 | .name = "tc3589x", | ||
180 | .mask = tc3589x_irq_dummy, | ||
181 | .unmask = tc3589x_irq_dummy, | ||
182 | }; | ||
183 | |||
184 | static int tc3589x_irq_init(struct tc3589x *tc3589x) | 173 | static int tc3589x_irq_init(struct tc3589x *tc3589x) |
185 | { | 174 | { |
186 | int base = tc3589x->irq_base; | 175 | int base = tc3589x->irq_base; |
@@ -188,7 +177,7 @@ static int tc3589x_irq_init(struct tc3589x *tc3589x) | |||
188 | 177 | ||
189 | for (irq = base; irq < base + TC3589x_NR_INTERNAL_IRQS; irq++) { | 178 | for (irq = base; irq < base + TC3589x_NR_INTERNAL_IRQS; irq++) { |
190 | set_irq_chip_data(irq, tc3589x); | 179 | set_irq_chip_data(irq, tc3589x); |
191 | set_irq_chip_and_handler(irq, &tc3589x_irq_chip, | 180 | set_irq_chip_and_handler(irq, &dummy_irq_chip, |
192 | handle_edge_irq); | 181 | handle_edge_irq); |
193 | set_irq_nested_thread(irq, 1); | 182 | set_irq_nested_thread(irq, 1); |
194 | #ifdef CONFIG_ARM | 183 | #ifdef CONFIG_ARM |