Commit ed7936f9 authored by Michael Opdenacker's avatar Michael Opdenacker Committed by Olof Johansson
Browse files

ARM: pxa: remove IRQF_DISABLED 



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

Signed-off-by: default avatarMichael Opdenacker <michael.opdenacker@free-electrons.com>
Acked-by: default avatarEric Miao <eric.y.miao@gmail.com>
Signed-off-by: default avatarHaojian Zhuang <haojian.zhuang@gmail.com>
[olof: Fixed compilation failure for pcm990-baseboard]
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent f45913fd

arch/arm/mach-pxa/am200epd.c

+1 −2
Original line number Diff line number Diff line
@@ -293,8 +293,7 @@ static int am200_setup_irq(struct fb_info *info) 
	int ret;



	ret = request_irq(PXA_GPIO_TO_IRQ(RDY_GPIO_PIN), am200_handle_irq,

				IRQF_DISABLED|IRQF_TRIGGER_FALLING,

				"AM200", info->par);

				IRQF_TRIGGER_FALLING, "AM200", info->par);

	if (ret)

		dev_err(&am200_device->dev, "request_irq failed: %d\n", ret);

arch/arm/mach-pxa/am300epd.c

+1 −2
Original line number Diff line number Diff line
@@ -241,8 +241,7 @@ static int am300_setup_irq(struct fb_info *info) 
	struct broadsheetfb_par *par = info->par;



	ret = request_irq(PXA_GPIO_TO_IRQ(RDY_GPIO_PIN), am300_handle_irq,

				IRQF_DISABLED|IRQF_TRIGGER_RISING,

				"AM300", par);

				IRQF_TRIGGER_RISING, "AM300", par);

	if (ret)

		dev_err(&am300_device->dev, "request_irq failed: %d\n", ret);

arch/arm/mach-pxa/em-x270.c

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



	err = request_irq(gpio_to_irq(mmc_cd), em_x270_detect_int,

			      IRQF_DISABLED | IRQF_TRIGGER_RISING |

			      IRQF_TRIGGER_FALLING,

			      IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,

			      "MMC card detect", data);

	if (err) {

		dev_err(dev, "can't request MMC card detect IRQ: %d\n", err);

arch/arm/mach-pxa/magician.c

+1 −1
Original line number Diff line number Diff line
@@ -634,7 +634,7 @@ static struct platform_device bq24022 = { 
static int magician_mci_init(struct device *dev,

				irq_handler_t detect_irq, void *data)

{

	return request_irq(IRQ_MAGICIAN_SD, detect_irq, IRQF_DISABLED,

	return request_irq(IRQ_MAGICIAN_SD, detect_irq, 0,

			   "mmc card detect", data);

}

arch/arm/mach-pxa/mainstone.c

+1 −1
Original line number Diff line number Diff line
@@ -401,7 +401,7 @@ static int mainstone_mci_init(struct device *dev, irq_handler_t mstone_detect_in 
	 */

	MST_MSCWR1 &= ~MST_MSCWR1_MS_SEL;



	err = request_irq(MAINSTONE_MMC_IRQ, mstone_detect_int, IRQF_DISABLED,

	err = request_irq(MAINSTONE_MMC_IRQ, mstone_detect_int, 0,

			     "MMC card detect", data);

	if (err)

		printk(KERN_ERR "mainstone_mci_init: MMC/SD: can't request MMC card detect IRQ\n");

CRA Git | Maintained and supported by SUSTech CRA and CCSE