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

Commit bc59d280 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Linus Torvalds
Browse files

[PATCH] irq-flags: PPC: Use the new IRQF_ constants 



Use the new IRQF_ constants and remove the SA_INTERRUPT define

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 6714465e

arch/ppc/8260_io/fcc_enet.c

+1 −1
Original line number Diff line number Diff line
@@ -2116,7 +2116,7 @@ init_fcc_startup(fcc_info_t *fip, struct net_device *dev) 


#ifdef	PHY_INTERRUPT

#ifdef CONFIG_ADS8272

	if (request_irq(PHY_INTERRUPT, mii_link_interrupt, SA_SHIRQ,

	if (request_irq(PHY_INTERRUPT, mii_link_interrupt, IRQF_SHARED,

				"mii", dev) < 0)

		printk(KERN_CRIT "Can't get MII IRQ %d\n", PHY_INTERRUPT);

#else

arch/ppc/platforms/85xx/mpc8560_ads.c

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ static irqreturn_t cpm2_cascade(int irq, void *dev_id, struct pt_regs *regs) 


static struct irqaction cpm2_irqaction = {

	.handler = cpm2_cascade,

	.flags = SA_INTERRUPT,

	.flags = IRQF_DISABLED,

	.mask = CPU_MASK_NONE,

	.name = "cpm2_cascade",

};

arch/ppc/platforms/85xx/mpc85xx_cds_common.c

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ static irqreturn_t cpm2_cascade(int irq, void *dev_id, struct pt_regs *regs) 


static struct irqaction cpm2_irqaction = {

	.handler = cpm2_cascade,

	.flags = SA_INTERRUPT,

	.flags = IRQF_DISABLED,

	.mask = CPU_MASK_NONE,

	.name = "cpm2_cascade",

};

arch/ppc/platforms/85xx/stx_gp3.c

+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ static irqreturn_t cpm2_cascade(int irq, void *dev_id, struct pt_regs *regs) 


static struct irqaction cpm2_irqaction = {

	.handler	= cpm2_cascade,

	.flags		= SA_INTERRUPT,

	.flags		= IRQF_DISABLED,

	.mask		= CPU_MASK_NONE,

	.name		= "cpm2_cascade",

};

arch/ppc/platforms/85xx/tqm85xx.c

+1 −1
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ static irqreturn_t cpm2_cascade(int irq, void *dev_id, struct pt_regs *regs) 


static struct irqaction cpm2_irqaction = {

	.handler = cpm2_cascade,

	.flags = SA_INTERRUPT,

	.flags = IRQF_DISABLED,

	.mask = CPU_MASK_NONE,

	.name = "cpm2_cascade",

};