From 794728b7a67aa3c8f40cb4199cb1d464fc8935ca Mon Sep 17 00:00:00 2001 From: Dirk Behme Date: Wed, 31 Jan 2007 11:09:08 -0800 Subject: [PATCH] ARM: OMAP: Convert interrupt flags SA_* to IRQF_* Convert interrupt flags SA_* to IRQF_* Signed-off-by: Dirk Behme Signed-off-by: Tony Lindgren --- arch/arm/mach-omap1/board-palmz71.c | 2 +- arch/arm/plat-omap/gpio-switch.c | 8 ++++---- arch/arm/plat-omap/mailbox.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-omap1/board-palmz71.c b/arch/arm/mach-omap1/board-palmz71.c index 6a53f12..3936190 100644 --- a/arch/arm/mach-omap1/board-palmz71.c +++ b/arch/arm/mach-omap1/board-palmz71.c @@ -342,7 +342,7 @@ palmz71_gpio_setup(int early) } omap_set_gpio_direction(PALMZ71_USBDETECT_GPIO, 1); if (request_irq(OMAP_GPIO_IRQ(PALMZ71_USBDETECT_GPIO), - palmz71_powercable, SA_SAMPLE_RANDOM, + palmz71_powercable, IRQF_SAMPLE_RANDOM, "palmz71-cable", 0)) printk(KERN_ERR "IRQ request for power cable failed!\n"); diff --git a/arch/arm/plat-omap/gpio-switch.c b/arch/arm/plat-omap/gpio-switch.c index 498e121..ddc26d6 100644 --- a/arch/arm/plat-omap/gpio-switch.c +++ b/arch/arm/plat-omap/gpio-switch.c @@ -301,16 +301,16 @@ static int __init new_switch(struct gpio_switch *sw) return 0; if (can_do_both_edges(sw)) { - trigger = SA_TRIGGER_FALLING | SA_TRIGGER_RISING; + trigger = IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING; sw->both_edges = 1; } else { if (omap_get_gpio_datain(sw->gpio)) - trigger = SA_TRIGGER_FALLING; + trigger = IRQF_TRIGGER_FALLING; else - trigger = SA_TRIGGER_RISING; + trigger = IRQF_TRIGGER_RISING; } r = request_irq(OMAP_GPIO_IRQ(sw->gpio), gpio_sw_irq_handler, - SA_SHIRQ | trigger, sw->name, sw); + IRQF_SHIRQ | trigger, sw->name, sw); if (r < 0) { printk(KERN_ERR "gpio-switch: request_irq() failed " "for GPIO %d\n", sw->gpio); diff --git a/arch/arm/plat-omap/mailbox.c b/arch/arm/plat-omap/mailbox.c index a159411..26ace23 100644 --- a/arch/arm/plat-omap/mailbox.c +++ b/arch/arm/plat-omap/mailbox.c @@ -247,7 +247,7 @@ static int omap_mbox_init(struct omap_mbox *mbox) if (unlikely(ret)) goto fail2; - ret = request_irq(mbox->irq, mbox_interrupt, SA_INTERRUPT, + ret = request_irq(mbox->irq, mbox_interrupt, IRQF_DISABLED, mbox->name, mbox); if (unlikely(ret)) { printk(KERN_ERR -- 1.4.4.2