Commit 4c1dd3e5 authored by Michael Opdenacker's avatar Michael Opdenacker Committed by Shawn Guo

ARM: imx: remove IRQF_DISABLED

This flag is a NOOP since 2.6.35 and can be removed.

This is an update for 3.11 of a patch already sent for 3.10
Signed-off-by: default avatarMichael Opdenacker <michael.opdenacker@free-electrons.com>
Acked-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
parent a9aec30d
...@@ -24,7 +24,7 @@ config MXC_IRQ_PRIOR ...@@ -24,7 +24,7 @@ config MXC_IRQ_PRIOR
help help
Select this if you want to use prioritized IRQ handling. Select this if you want to use prioritized IRQ handling.
This feature prevents higher priority ISR to be interrupted This feature prevents higher priority ISR to be interrupted
by lower priority IRQ even IRQF_DISABLED flag is not set. by lower priority IRQ.
This may be useful in embedded applications, where are strong This may be useful in embedded applications, where are strong
requirements for timing. requirements for timing.
Say N here, unless you have a specialized requirement. Say N here, unless you have a specialized requirement.
......
...@@ -171,7 +171,7 @@ static irqreturn_t epit_timer_interrupt(int irq, void *dev_id) ...@@ -171,7 +171,7 @@ static irqreturn_t epit_timer_interrupt(int irq, void *dev_id)
static struct irqaction epit_timer_irq = { static struct irqaction epit_timer_irq = {
.name = "i.MX EPIT Timer Tick", .name = "i.MX EPIT Timer Tick",
.flags = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL, .flags = IRQF_TIMER | IRQF_IRQPOLL,
.handler = epit_timer_interrupt, .handler = epit_timer_interrupt,
}; };
......
...@@ -404,8 +404,7 @@ static int armadillo5x0_sdhc1_init(struct device *dev, ...@@ -404,8 +404,7 @@ static int armadillo5x0_sdhc1_init(struct device *dev,
/* When supported the trigger type have to be BOTH */ /* When supported the trigger type have to be BOTH */
ret = request_irq(gpio_to_irq(IOMUX_TO_GPIO(MX31_PIN_ATA_DMACK)), ret = request_irq(gpio_to_irq(IOMUX_TO_GPIO(MX31_PIN_ATA_DMACK)),
detect_irq, detect_irq, IRQF_TRIGGER_FALLING,
IRQF_DISABLED | IRQF_TRIGGER_FALLING,
"sdhc-detect", data); "sdhc-detect", data);
if (ret) if (ret)
......
...@@ -311,7 +311,7 @@ static int mx31_3ds_sdhc1_init(struct device *dev, ...@@ -311,7 +311,7 @@ static int mx31_3ds_sdhc1_init(struct device *dev,
} }
ret = request_irq(gpio_to_irq(IOMUX_TO_GPIO(MX31_PIN_GPIO3_1)), ret = request_irq(gpio_to_irq(IOMUX_TO_GPIO(MX31_PIN_GPIO3_1)),
detect_irq, IRQF_DISABLED | detect_irq,
IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING, IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING,
"sdhc1-detect", data); "sdhc1-detect", data);
if (ret) { if (ret) {
......
...@@ -371,8 +371,7 @@ static int pcm970_sdhc1_init(struct device *dev, irq_handler_t detect_irq, ...@@ -371,8 +371,7 @@ static int pcm970_sdhc1_init(struct device *dev, irq_handler_t detect_irq,
#endif #endif
ret = request_irq(gpio_to_irq(IOMUX_TO_GPIO(MX31_PIN_SCK6)), detect_irq, ret = request_irq(gpio_to_irq(IOMUX_TO_GPIO(MX31_PIN_SCK6)), detect_irq,
IRQF_DISABLED | IRQF_TRIGGER_FALLING, IRQF_TRIGGER_FALLING, "sdhc-detect", data);
"sdhc-detect", data);
if (ret) if (ret)
goto err_gpio_free_2; goto err_gpio_free_2;
......
...@@ -130,8 +130,7 @@ static int mxc_mmc1_init(struct device *dev, ...@@ -130,8 +130,7 @@ static int mxc_mmc1_init(struct device *dev,
gpio_direction_input(gpio_wp); gpio_direction_input(gpio_wp);
ret = request_irq(gpio_to_irq(IOMUX_TO_GPIO(MX31_PIN_GPIO1_1)), ret = request_irq(gpio_to_irq(IOMUX_TO_GPIO(MX31_PIN_GPIO1_1)),
detect_irq, detect_irq, IRQF_TRIGGER_FALLING,
IRQF_DISABLED | IRQF_TRIGGER_FALLING,
"MMC detect", data); "MMC detect", data);
if (ret) if (ret)
goto exit_free_wp; goto exit_free_wp;
......
...@@ -250,7 +250,7 @@ static irqreturn_t mxc_timer_interrupt(int irq, void *dev_id) ...@@ -250,7 +250,7 @@ static irqreturn_t mxc_timer_interrupt(int irq, void *dev_id)
static struct irqaction mxc_timer_irq = { static struct irqaction mxc_timer_irq = {
.name = "i.MX Timer Tick", .name = "i.MX Timer Tick",
.flags = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL, .flags = IRQF_TIMER | IRQF_IRQPOLL,
.handler = mxc_timer_interrupt, .handler = mxc_timer_interrupt,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment