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

Commit 26632bec authored by Michael Opdenacker's avatar Michael Opdenacker Committed by Russell King
Browse files

ARM: 7995/1: footbridge: remove obsolete IRQF_DISABLED 



This patch removes the IRQF_DISABLED flag from footbridge
code. It's a NOOP since 2.6.35.

Signed-off-by: default avatarMichael Opdenacker <michael.opdenacker@free-electrons.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent fec51014

arch/arm/mach-footbridge/dc21285-timer.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -105,7 +105,7 @@ static irqreturn_t timer1_interrupt(int irq, void *dev_id) 
static struct irqaction footbridge_timer_irq = {

static struct irqaction footbridge_timer_irq = {

	.name		= "dc21285_timer1",

	.name		= "dc21285_timer1",

	.handler	= timer1_interrupt,

	.handler	= timer1_interrupt,

	.flags		= IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL,

	.flags		= IRQF_TIMER | IRQF_IRQPOLL,

	.dev_id		= &ckevt_dc21285,

	.dev_id		= &ckevt_dc21285,

};

};

arch/arm/mach-footbridge/dc21285.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -334,15 +334,15 @@ void __init dc21285_preinit(void) 
	/*

	/*

	 * We don't care if these fail.

	 * We don't care if these fail.

	 */

	 */

	dc21285_request_irq(IRQ_PCI_SERR, dc21285_serr_irq, IRQF_DISABLED,

	dc21285_request_irq(IRQ_PCI_SERR, dc21285_serr_irq, 0,

			    "PCI system error", &serr_timer);

			    "PCI system error", &serr_timer);

	dc21285_request_irq(IRQ_PCI_PERR, dc21285_parity_irq, IRQF_DISABLED,

	dc21285_request_irq(IRQ_PCI_PERR, dc21285_parity_irq, 0,

			    "PCI parity error", &perr_timer);

			    "PCI parity error", &perr_timer);

	dc21285_request_irq(IRQ_PCI_ABORT, dc21285_abort_irq, IRQF_DISABLED,

	dc21285_request_irq(IRQ_PCI_ABORT, dc21285_abort_irq, 0,

			    "PCI abort", NULL);

			    "PCI abort", NULL);

	dc21285_request_irq(IRQ_DISCARD_TIMER, dc21285_discard_irq, IRQF_DISABLED,

	dc21285_request_irq(IRQ_DISCARD_TIMER, dc21285_discard_irq, 0,

			    "Discard timer", NULL);

			    "Discard timer", NULL);

	dc21285_request_irq(IRQ_PCI_DPERR, dc21285_dparity_irq, IRQF_DISABLED,

	dc21285_request_irq(IRQ_PCI_DPERR, dc21285_dparity_irq, 0,

			    "PCI data parity", NULL);

			    "PCI data parity", NULL);





	if (cfn_mode) {

	if (cfn_mode) {

arch/arm/mach-footbridge/isa-timer.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -27,7 +27,7 @@ static irqreturn_t pit_timer_interrupt(int irq, void *dev_id) 
static struct irqaction pit_timer_irq = {

static struct irqaction pit_timer_irq = {

	.name		= "pit",

	.name		= "pit",

	.handler	= pit_timer_interrupt,

	.handler	= pit_timer_interrupt,

	.flags		= IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL,

	.flags		= IRQF_TIMER | IRQF_IRQPOLL,

	.dev_id		= &i8253_clockevent,

	.dev_id		= &i8253_clockevent,

};

};