aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2009-10-10 22:38:36 +0200
committerLars-Peter Clausen <lars@metafoo.de>2009-12-06 08:46:44 +0100
commitd8d242913d95a1da275e629daad84c77cda5a715 (patch)
treec025cbba5639a8cf922e0891478cfb9d968d0138 /drivers
parent8df9f739a7a958c2d7f083721d63649a16bf9797 (diff)
glamo: Use set_irq_data instead of set_irq_chip_data for the demux handler
Also fixup order in which the irq handler and it's data are initalized.
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mfd/glamo/glamo-core.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c
index b15f0fc0974..d70c27f5b64 100644
--- a/drivers/mfd/glamo/glamo-core.c
+++ b/drivers/mfd/glamo/glamo-core.c
@@ -310,7 +310,7 @@ static struct irq_chip glamo_irq_chip = {
static void glamo_irq_demux_handler(unsigned int irq, struct irq_desc *desc)
{
- struct glamo_core *glamo = get_irq_desc_chip_data(desc);
+ struct glamo_core *glamo = get_irq_desc_data(desc);
desc->status &= ~(IRQ_REPLAY | IRQ_WAITING);
if (unlikely(desc->status & IRQ_INPROGRESS)) {
@@ -981,15 +981,15 @@ static int __devinit glamo_probe(struct platform_device *pdev)
* finally set the mfd interrupts up
*/
for (irq = irq_base; irq < irq_base + GLAMO_NR_IRQS; ++irq) {
- set_irq_chip_and_handler(irq, &glamo_irq_chip,
- handle_level_irq);
set_irq_flags(irq, IRQF_VALID);
set_irq_chip_data(irq, glamo);
+ set_irq_chip_and_handler(irq, &glamo_irq_chip,
+ handle_level_irq);
}
- set_irq_chained_handler(glamo->irq, glamo_irq_demux_handler);
set_irq_type(glamo->irq, IRQ_TYPE_EDGE_FALLING);
- set_irq_chip_data(glamo->irq, glamo);
+ set_irq_data(glamo->irq, glamo);
+ set_irq_chained_handler(glamo->irq, glamo_irq_demux_handler);
glamo->irq_works = 1;
ret = mfd_add_devices(&pdev->dev, pdev->id, glamo_cells,
@@ -1012,8 +1012,8 @@ err_free_irqs:
set_irq_chip_data(glamo->irq, NULL);
for (irq = irq_base; irq < irq_base + GLAMO_NR_IRQS; ++irq) {
- set_irq_flags(irq, 0);
set_irq_chip(irq, NULL);
+ set_irq_flags(irq, 0);
set_irq_chip_data(irq, NULL);
}
err_iounmap: