Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ee6564d authored by Michael Opdenacker's avatar Michael Opdenacker Committed by Russell King
Browse files

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: default avatarMichael Opdenacker <michael.opdenacker@free-electrons.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 19bd9b28

arch/arm/mach-ixp4xx/common.c

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


static struct irqaction ixp4xx_timer_irq = {

	.name		= "timer1",

	.flags		= IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL,

	.flags		= IRQF_TIMER | IRQF_IRQPOLL,

	.handler	= ixp4xx_timer_interrupt,

	.dev_id		= &clockevent_ixp4xx,

};

arch/arm/mach-ixp4xx/dsmg600-setup.c

+1 −2
Original line number Diff line number Diff line
@@ -233,8 +233,7 @@ static int __init dsmg600_gpio_init(void) 


	gpio_request(DSMG600_RB_GPIO, "reset button");

	if (request_irq(gpio_to_irq(DSMG600_RB_GPIO), &dsmg600_reset_handler,

		IRQF_DISABLED | IRQF_TRIGGER_LOW,

		"DSM-G600 reset button", NULL) < 0) {

		IRQF_TRIGGER_LOW, "DSM-G600 reset button", NULL) < 0) {



		printk(KERN_DEBUG "Reset Button IRQ %d not available\n",

			gpio_to_irq(DSMG600_RB_GPIO));

arch/arm/mach-ixp4xx/fsg-setup.c

+2 −4
Original line number Diff line number Diff line
@@ -208,16 +208,14 @@ static void __init fsg_init(void) 
	platform_add_devices(fsg_devices, ARRAY_SIZE(fsg_devices));



	if (request_irq(gpio_to_irq(FSG_RB_GPIO), &fsg_reset_handler,

			IRQF_DISABLED | IRQF_TRIGGER_LOW,

			"FSG reset button", NULL) < 0) {

			IRQF_TRIGGER_LOW, "FSG reset button", NULL) < 0) {



		printk(KERN_DEBUG "Reset Button IRQ %d not available\n",

			gpio_to_irq(FSG_RB_GPIO));

	}



	if (request_irq(gpio_to_irq(FSG_SB_GPIO), &fsg_power_handler,

			IRQF_DISABLED | IRQF_TRIGGER_LOW,

			"FSG power button", NULL) < 0) {

			IRQF_TRIGGER_LOW, "FSG power button", NULL) < 0) {



		printk(KERN_DEBUG "Power Button IRQ %d not available\n",

			gpio_to_irq(FSG_SB_GPIO));

arch/arm/mach-ixp4xx/nas100d-setup.c

+1 −2
Original line number Diff line number Diff line
@@ -295,8 +295,7 @@ static void __init nas100d_init(void) 
	pm_power_off = nas100d_power_off;



	if (request_irq(gpio_to_irq(NAS100D_RB_GPIO), &nas100d_reset_handler,

		IRQF_DISABLED | IRQF_TRIGGER_LOW,

		"NAS100D reset button", NULL) < 0) {

		IRQF_TRIGGER_LOW, "NAS100D reset button", NULL) < 0) {



		printk(KERN_DEBUG "Reset Button IRQ %d not available\n",

			gpio_to_irq(NAS100D_RB_GPIO));

arch/arm/mach-ixp4xx/nslu2-setup.c

+2 −4
Original line number Diff line number Diff line
@@ -265,16 +265,14 @@ static void __init nslu2_init(void) 
	pm_power_off = nslu2_power_off;



	if (request_irq(gpio_to_irq(NSLU2_RB_GPIO), &nslu2_reset_handler,

		IRQF_DISABLED | IRQF_TRIGGER_LOW,

		"NSLU2 reset button", NULL) < 0) {

		IRQF_TRIGGER_LOW, "NSLU2 reset button", NULL) < 0) {



		printk(KERN_DEBUG "Reset Button IRQ %d not available\n",

			gpio_to_irq(NSLU2_RB_GPIO));

	}



	if (request_irq(gpio_to_irq(NSLU2_PB_GPIO), &nslu2_power_handler,

		IRQF_DISABLED | IRQF_TRIGGER_HIGH,

		"NSLU2 power button", NULL) < 0) {

		IRQF_TRIGGER_HIGH, "NSLU2 power button", NULL) < 0) {



		printk(KERN_DEBUG "Power Button IRQ %d not available\n",

			gpio_to_irq(NSLU2_PB_GPIO));