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

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

arch/arm/mach-imx/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ config MXC_IRQ_PRIOR 
	help

	  Select this if you want to use prioritized IRQ handling.

	  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

	  requirements for timing.

	  Say N here, unless you have a specialized requirement.

arch/arm/mach-imx/epit.c

+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ static irqreturn_t epit_timer_interrupt(int irq, void *dev_id) 


static struct irqaction epit_timer_irq = {

	.name		= "i.MX EPIT Timer Tick",

	.flags		= IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL,

	.flags		= IRQF_TIMER | IRQF_IRQPOLL,

	.handler	= epit_timer_interrupt,

};

arch/arm/mach-imx/mach-armadillo5x0.c

+1 −2
Original line number Diff line number Diff line
@@ -404,8 +404,7 @@ static int armadillo5x0_sdhc1_init(struct device *dev, 


	/* When supported the trigger type have to be BOTH */

	ret = request_irq(gpio_to_irq(IOMUX_TO_GPIO(MX31_PIN_ATA_DMACK)),

			  detect_irq,

			  IRQF_DISABLED | IRQF_TRIGGER_FALLING,

			  detect_irq, IRQF_TRIGGER_FALLING,

			  "sdhc-detect", data);



	if (ret)

arch/arm/mach-imx/mach-mx31_3ds.c

+1 −1
Original line number Diff line number Diff line
@@ -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)),

			  detect_irq, IRQF_DISABLED |

			  detect_irq,

			  IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING,

			  "sdhc1-detect", data);

	if (ret) {

arch/arm/mach-imx/mach-pcm037.c

+1 −2
Original line number Diff line number Diff line
@@ -371,8 +371,7 @@ static int pcm970_sdhc1_init(struct device *dev, irq_handler_t detect_irq, 
#endif



	ret = request_irq(gpio_to_irq(IOMUX_TO_GPIO(MX31_PIN_SCK6)), detect_irq,

			IRQF_DISABLED | IRQF_TRIGGER_FALLING,

				"sdhc-detect", data);

			IRQF_TRIGGER_FALLING, "sdhc-detect", data);

	if (ret)

		goto err_gpio_free_2;

CRA Git | Maintained and supported by SUSTech CRA and CCSE