diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2009-10-10 22:46:02 +0200 |
|---|---|---|
| committer | Lars-Peter Clausen <lars@metafoo.de> | 2009-10-10 22:46:02 +0200 |
| commit | dda793e722a5db08345dbf642c7590c7eb61ab67 (patch) | |
| tree | 13da6e6ae8a327cbfb1f7b9ff1c1b9fefa00e01c /drivers | |
| parent | e4f3a9b77064267d5f15f0ed3054c61931410cf2 (diff) | |
glamo-core: Use set_irq_flags on ARM only. set_irq_{no,}prove everywhere else
Although there will probably never any other platform using the glamo...
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mfd/glamo/glamo-core.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c index d70c27f5b64..e0e39409595 100644 --- a/drivers/mfd/glamo/glamo-core.c +++ b/drivers/mfd/glamo/glamo-core.c @@ -981,7 +981,11 @@ 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) { +#ifdef CONFIG_ARM set_irq_flags(irq, IRQF_VALID); +#else + set_irq_noprobe(irq); +#endif set_irq_chip_data(irq, glamo); set_irq_chip_and_handler(irq, &glamo_irq_chip, handle_level_irq); @@ -1013,7 +1017,11 @@ err_free_irqs: for (irq = irq_base; irq < irq_base + GLAMO_NR_IRQS; ++irq) { set_irq_chip(irq, NULL); +#ifdef CONFIG_ARM set_irq_flags(irq, 0); +#else + set_irq_probe(irq); +#endif set_irq_chip_data(irq, NULL); } err_iounmap: @@ -1040,7 +1048,11 @@ static int __devexit glamo_remove(struct platform_device *pdev) set_irq_chip_data(glamo->irq, NULL); for (irq = irq_base; irq < irq_base + GLAMO_NR_IRQS; ++irq) { +#ifdef CONFIG_ARM set_irq_flags(irq, 0); +#else + set_irq_noprobe(); +#endif set_irq_chip(irq, NULL); set_irq_chip_data(irq, NULL); } |