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

Commit 64d8ad93 authored Sep 04, 2013 by Michael Opdenacker Committed by Jesper Nilsson Jan 08, 2014

cris: remove deprecated IRQF_DISABLED



This patch proposes to remove the IRQF_DISABLED flag from CRIS
architecture code. It's a NOOP since 2.6.35 and it will be removed
one day.

Comments mentioning IRQF_DISABLED are also updated, knowing
that all interrupts are now "fast interrupts", their handlers
running with interrupts disabled.

Don't hesitate to let me know if you have other ways of
rephrasing the comments!

This is an update for 3.11 of a patch already sent for 3.10

Signed-off-by: Michael Opdenacker <michael.opdenacker@free-electrons.com>
Signed-off-by: Jesper Nilsson <jespern@axis.com>

parent ceb3b021

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -838,13 +838,13 @@ static int __init gpio_init(void)
		* in some tests.
		*/
		res = request_irq(TIMER0_IRQ_NBR, gpio_poll_timer_interrupt,
		IRQF_SHARED \| IRQF_DISABLED, "gpio poll", gpio_name);
		IRQF_SHARED, "gpio poll", gpio_name);
		if (res) {
		printk(KERN_CRIT "err: timer0 irq for gpio\n");
		return res;
		}
		res = request_irq(PA_IRQ_NBR, gpio_interrupt,
		IRQF_SHARED \| IRQF_DISABLED, "gpio PA", gpio_name);
		IRQF_SHARED, "gpio PA", gpio_name);
		if (res)
		printk(KERN_CRIT "err: PA irq for gpio\n");

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -580,7 +580,7 @@ static int sync_serial_open(struct inode inode, struct file file)
		if (port == &ports[0]) {
		if (request_irq(8,
		manual_interrupt,
		IRQF_SHARED \| IRQF_DISABLED,
		IRQF_SHARED,
		"synchronous serial manual irq",
		&ports[0])) {
		printk(KERN_CRIT "Can't alloc "
		@@ -590,7 +590,7 @@ static int sync_serial_open(struct inode inode, struct file file)
		} else if (port == &ports[1]) {
		if (request_irq(8,
		manual_interrupt,
		IRQF_SHARED \| IRQF_DISABLED,
		IRQF_SHARED,
		"synchronous serial manual irq",
		&ports[1])) {
		printk(KERN_CRIT "Can't alloc "

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

+2 −4

Original line number	Diff line number	Diff line
		@@ -178,13 +178,11 @@ timer_interrupt(int irq, void *dev_id)
		return IRQ_HANDLED;
		}

		/* 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
		*/
		/* timer is IRQF_SHARED so drivers can add stuff to the timer irq chain */

		static struct irqaction irq2 = {
		.handler = timer_interrupt,
		.flags = IRQF_SHARED \| IRQF_DISABLED,
		.flags = IRQF_SHARED,
		.name = "timer",
		};

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -978,7 +978,7 @@ static int __init gpio_init(void)
		CRIS_LED_DISK_WRITE(0);

		int res2 = request_irq(GIO_INTR_VECT, gpio_interrupt,
		IRQF_SHARED \| IRQF_DISABLED, "gpio", &alarmlist);
		IRQF_SHARED, "gpio", &alarmlist);
		if (res2) {
		printk(KERN_ERR "err: irq for gpio\n");
		return res2;

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -964,11 +964,11 @@ gpio_init(void)
		* in some tests.
		*/
		if (request_irq(TIMER0_INTR_VECT, gpio_poll_timer_interrupt,
		IRQF_SHARED \| IRQF_DISABLED, "gpio poll", &alarmlist))
		IRQF_SHARED, "gpio poll", &alarmlist))
		printk(KERN_ERR "timer0 irq for gpio\n");

		if (request_irq(GIO_INTR_VECT, gpio_pa_interrupt,
		IRQF_SHARED \| IRQF_DISABLED, "gpio PA", &alarmlist))
		IRQF_SHARED, "gpio PA", &alarmlist))
		printk(KERN_ERR "PA irq for gpio\n");

		#ifdef CONFIG_ETRAX_VIRTUAL_GPIO