diff options
author | Michael Opdenacker <michael@free-electrons.com> | 2014-03-04 15:59:03 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-03-12 06:32:33 -0400 |
commit | 1ee6564d72ce718bf4e50d5684aa98d9d895f859 (patch) | |
tree | 48604cb661d2f025e5e2b1d190b6de708621fc9b /arch/arm/mach-ixp4xx/fsg-setup.c | |
parent | 19bd9b286da6f28f4cb04757dd8509a38f9f34d7 (diff) |
ARM: 7998/1: IXP4xx: remove deprecated IRQF_DISABLED
This patch removes the use of the IRQF_DISABLED flag
from code in arch/arm/mach-ixp4xx
It's a NOOP since 2.6.35 and it will be removed one day.
Signed-off-by: Michael Opdenacker <michael.opdenacker@free-electrons.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-ixp4xx/fsg-setup.c')
-rw-r--r-- | arch/arm/mach-ixp4xx/fsg-setup.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/mach-ixp4xx/fsg-setup.c b/arch/arm/mach-ixp4xx/fsg-setup.c index 429966b756ed..5c4b0c4a1b37 100644 --- a/arch/arm/mach-ixp4xx/fsg-setup.c +++ b/arch/arm/mach-ixp4xx/fsg-setup.c | |||
@@ -208,16 +208,14 @@ static void __init fsg_init(void) | |||
208 | platform_add_devices(fsg_devices, ARRAY_SIZE(fsg_devices)); | 208 | platform_add_devices(fsg_devices, ARRAY_SIZE(fsg_devices)); |
209 | 209 | ||
210 | if (request_irq(gpio_to_irq(FSG_RB_GPIO), &fsg_reset_handler, | 210 | if (request_irq(gpio_to_irq(FSG_RB_GPIO), &fsg_reset_handler, |
211 | IRQF_DISABLED | IRQF_TRIGGER_LOW, | 211 | IRQF_TRIGGER_LOW, "FSG reset button", NULL) < 0) { |
212 | "FSG reset button", NULL) < 0) { | ||
213 | 212 | ||
214 | printk(KERN_DEBUG "Reset Button IRQ %d not available\n", | 213 | printk(KERN_DEBUG "Reset Button IRQ %d not available\n", |
215 | gpio_to_irq(FSG_RB_GPIO)); | 214 | gpio_to_irq(FSG_RB_GPIO)); |
216 | } | 215 | } |
217 | 216 | ||
218 | if (request_irq(gpio_to_irq(FSG_SB_GPIO), &fsg_power_handler, | 217 | if (request_irq(gpio_to_irq(FSG_SB_GPIO), &fsg_power_handler, |
219 | IRQF_DISABLED | IRQF_TRIGGER_LOW, | 218 | IRQF_TRIGGER_LOW, "FSG power button", NULL) < 0) { |
220 | "FSG power button", NULL) < 0) { | ||
221 | 219 | ||
222 | printk(KERN_DEBUG "Power Button IRQ %d not available\n", | 220 | printk(KERN_DEBUG "Power Button IRQ %d not available\n", |
223 | gpio_to_irq(FSG_SB_GPIO)); | 221 | gpio_to_irq(FSG_SB_GPIO)); |