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

Commit aa7135ff authored Jul 01, 2006 by Thomas Gleixner Committed by Linus Torvalds Jul 02, 2006

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

Use the new IRQF_ constants and remove the SA_INTERRUPT define

Signed-off-by: Thomas 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: Mikael Starvik <starvik@axis.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

parent af0f4d36

arch/cris/arch-v10/drivers/gpio.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -937,11 +937,11 @@ gpio_init(void)
		* in some tests.
		*/
		if (request_irq(TIMER0_IRQ_NBR, gpio_poll_timer_interrupt,
		SA_SHIRQ \| SA_INTERRUPT,"gpio poll", NULL)) {
		IRQF_SHARED \| IRQF_DISABLED,"gpio poll", NULL)) {
		printk(KERN_CRIT "err: timer0 irq for gpio\n");
		}
		if (request_irq(PA_IRQ_NBR, gpio_pa_interrupt,
		SA_SHIRQ \| SA_INTERRUPT,"gpio PA", NULL)) {
		IRQF_SHARED \| IRQF_DISABLED,"gpio PA", NULL)) {
		printk(KERN_CRIT "err: PA irq for gpio\n");
		}

arch/cris/arch-v10/kernel/time.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -251,11 +251,11 @@ timer_interrupt(int irq, void dev_id, struct pt_regs regs)
		return IRQ_HANDLED;
		}

		/* timer is SA_SHIRQ so drivers can add stuff to the timer irq chain
		* it needs to be SA_INTERRUPT to make the jiffies update work properly
		/* timer is IRQF_SHARED so drivers can add stuff to the timer irq chain
		* it needs to be IRQF_DISABLED to make the jiffies update work properly
		*/

		static struct irqaction irq2 = { timer_interrupt, SA_SHIRQ \| SA_INTERRUPT,
		static struct irqaction irq2 = { timer_interrupt, IRQF_SHARED \| IRQF_DISABLED,
		CPU_MASK_NONE, "timer", NULL, NULL};

		void __init

arch/cris/arch-v32/drivers/gpio.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -744,11 +744,11 @@ gpio_init(void)
		* in some tests.
		*/
		if (request_irq(TIMER_INTR_VECT, gpio_poll_timer_interrupt,
		SA_SHIRQ \| SA_INTERRUPT,"gpio poll", &alarmlist)) {
		IRQF_SHARED \| IRQF_DISABLED,"gpio poll", &alarmlist)) {
		printk("err: timer0 irq for gpio\n");
		}
		if (request_irq(GEN_IO_INTR_VECT, gpio_pa_interrupt,
		SA_SHIRQ \| SA_INTERRUPT,"gpio PA", &alarmlist)) {
		IRQF_SHARED \| IRQF_DISABLED,"gpio PA", &alarmlist)) {
		printk("err: PA irq for gpio\n");
		}
		/* enable the gio and timer irq in global config */

arch/cris/arch-v32/kernel/arbiter.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -119,7 +119,7 @@ static void crisv32_arbiter_init(void)
		crisv32_arbiter_config(EXT_REGION);
		crisv32_arbiter_config(INT_REGION);

		if (request_irq(MEMARB_INTR_VECT, crisv32_arbiter_irq, SA_INTERRUPT,
		if (request_irq(MEMARB_INTR_VECT, crisv32_arbiter_irq, IRQF_DISABLED,
		"arbiter", NULL))
		printk(KERN_ERR "Couldn't allocate arbiter IRQ\n");

arch/cris/arch-v32/kernel/fasttimer.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -981,7 +981,7 @@ void fast_timer_init(void)
		proc_register_dynamic(&proc_root, &fasttimer_proc_entry);
		#endif
		#endif /* PROC_FS */
		if(request_irq(TIMER_INTR_VECT, timer_trig_interrupt, SA_INTERRUPT,
		if(request_irq(TIMER_INTR_VECT, timer_trig_interrupt, IRQF_DISABLED,
		"fast timer int", NULL))
		{
		printk("err: timer1 irq\n");