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

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

[PATCH] irq-flags: SH: 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>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Kazumoto Kojima <kkojima@rr.iij4u.or.jp>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 5fb55ae9

arch/sh/boards/snapgear/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ static int __init eraseconfig_init(void) 
{

	printk("SnapGear: EraseConfig init\n");

	/* Setup "EraseConfig" switch on external IRQ 0 */

	if (request_irq(IRL0_IRQ, eraseconfig_interrupt, SA_INTERRUPT,

	if (request_irq(IRL0_IRQ, eraseconfig_interrupt, IRQF_DISABLED,

				"Erase Config", NULL))

		printk("SnapGear: failed to register IRQ%d for Reset witch\n",

				IRL0_IRQ);

arch/sh/cchips/hd6446x/hd64461/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ int hd64461_irq_demux(int irq) 
	return __irq_demux(irq);

}



static struct irqaction irq0 = { hd64461_interrupt, SA_INTERRUPT, CPU_MASK_NONE, "HD64461", NULL, NULL };

static struct irqaction irq0 = { hd64461_interrupt, IRQF_DISABLED, CPU_MASK_NONE, "HD64461", NULL, NULL };



int __init setup_hd64461(void)

{

arch/sh/cchips/hd6446x/hd64465/gpio.c

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ static int __init hd64465_gpio_init(void) 
	if (!request_region(HD64465_REG_GPACR, 0x1000, MODNAME))

		return -EBUSY;

	if (request_irq(HD64465_IRQ_GPIO, hd64465_gpio_interrupt,

	    		SA_INTERRUPT, MODNAME, 0))

	    		IRQF_DISABLED, MODNAME, 0))

		goto out_irqfailed;



    	printk("HD64465 GPIO layer on irq %d\n", HD64465_IRQ_GPIO);

arch/sh/cchips/hd6446x/hd64465/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ int hd64465_irq_demux(int irq) 
	return irq;

}



static struct irqaction irq0  = { hd64465_interrupt, SA_INTERRUPT, CPU_MASK_NONE, "HD64465", NULL, NULL};

static struct irqaction irq0  = { hd64465_interrupt, IRQF_DISABLED, CPU_MASK_NONE, "HD64465", NULL, NULL};





static int __init setup_hd64465(void)

arch/sh/cchips/voyagergx/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ int voyagergx_irq_demux(int irq) 
static struct irqaction irq0  = {

	.name		= "voyagergx",

	.handler	= voyagergx_interrupt,

	.flags		= SA_INTERRUPT,

	.flags		= IRQF_DISABLED,

	.mask		= CPU_MASK_NONE,

};