aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2009-10-10 22:46:02 +0200
committerLars-Peter Clausen <lars@metafoo.de>2009-12-06 08:46:44 +0100
commitac5c539d2543ec5145abf5f020f912b83a4fd089 (patch)
treeb854d71e8b2bdeda8e9351e13738783f4bf117df /drivers
parentd8d242913d95a1da275e629daad84c77cda5a715 (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.c12
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);
}