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

Commit 08e4cf4b authored by Michael Opdenacker's avatar Michael Opdenacker Committed by Linus Torvalds
Browse files

frv: remove deprecated IRQF_DISABLED 



Remove the IRQF_DISABLED flag from FRV architecture code.  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>
Cc: David Howells <dhowells@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 21f45660

arch/frv/kernel/irq-mb93091.c

+4 −4
Original line number Diff line number Diff line
@@ -107,25 +107,25 @@ static irqreturn_t fpga_interrupt(int irq, void *_mask) 
static struct irqaction fpga_irq[4]  = {

	[0] = {

		.handler	= fpga_interrupt,

		.flags		= IRQF_DISABLED | IRQF_SHARED,

		.flags		= IRQF_SHARED,

		.name		= "fpga.0",

		.dev_id		= (void *) 0x0028UL,

	},

	[1] = {

		.handler	= fpga_interrupt,

		.flags		= IRQF_DISABLED | IRQF_SHARED,

		.flags		= IRQF_SHARED,

		.name		= "fpga.1",

		.dev_id		= (void *) 0x0050UL,

	},

	[2] = {

		.handler	= fpga_interrupt,

		.flags		= IRQF_DISABLED | IRQF_SHARED,

		.flags		= IRQF_SHARED,

		.name		= "fpga.2",

		.dev_id		= (void *) 0x1c00UL,

	},

	[3] = {

		.handler	= fpga_interrupt,

		.flags		= IRQF_DISABLED | IRQF_SHARED,

		.flags		= IRQF_SHARED,

		.name		= "fpga.3",

		.dev_id		= (void *) 0x6386UL,

	}

arch/frv/kernel/irq-mb93093.c

+0 −1
Original line number Diff line number Diff line
@@ -105,7 +105,6 @@ static irqreturn_t fpga_interrupt(int irq, void *_mask) 
static struct irqaction fpga_irq[1]  = {

	[0] = {

		.handler	= fpga_interrupt,

		.flags		= IRQF_DISABLED,

		.name		= "fpga.0",

		.dev_id		= (void *) 0x0700UL,

	}

arch/frv/kernel/irq-mb93493.c

+2 −2
Original line number Diff line number Diff line
@@ -118,13 +118,13 @@ static irqreturn_t mb93493_interrupt(int irq, void *_piqsr) 
static struct irqaction mb93493_irq[2]  = {

	[0] = {

		.handler	= mb93493_interrupt,

		.flags		= IRQF_DISABLED | IRQF_SHARED,

		.flags		= IRQF_SHARED,

		.name		= "mb93493.0",

		.dev_id		= (void *) __addr_MB93493_IQSR(0),

	},

	[1] = {

		.handler	= mb93493_interrupt,

		.flags		= IRQF_DISABLED | IRQF_SHARED,

		.flags		= IRQF_SHARED,

		.name		= "mb93493.1",

		.dev_id		= (void *) __addr_MB93493_IQSR(1),

	}

arch/frv/kernel/time.c

+0 −1
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ static irqreturn_t timer_interrupt(int irq, void *dummy); 


static struct irqaction timer_irq  = {

	.handler = timer_interrupt,

	.flags = IRQF_DISABLED,

	.name = "timer",

};