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

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

[PATCH] irq-flags: H8300: 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: Yoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent bc2e2635

arch/h8300/kernel/ints.c

+2 −2
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ int request_irq(unsigned int irq, 
	irq_handle->devname = devname;

	irq_list[irq] = irq_handle;



	if (irq_handle->flags & SA_SAMPLE_RANDOM)

	if (irq_handle->flags & IRQF_SAMPLE_RANDOM)

		rand_initialize_irq(irq);



	enable_irq(irq);
@@ -222,7 +222,7 @@ asmlinkage void process_int(int irq, struct pt_regs *fp) 
		if (irq_list[irq]) {

			irq_list[irq]->handler(irq, irq_list[irq]->dev_id, fp);

			irq_list[irq]->count++;

			if (irq_list[irq]->flags & SA_SAMPLE_RANDOM)

			if (irq_list[irq]->flags & IRQF_SAMPLE_RANDOM)

				add_interrupt_randomness(irq);

		}

	} else {

arch/h8300/platform/h8s/ints.c

+2 −2
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ int request_irq(unsigned int irq, 
	irq_handle->dev_id  = dev_id;

	irq_handle->devname = devname;

	irq_list[irq] = irq_handle;

	if (irq_handle->flags & SA_SAMPLE_RANDOM)

	if (irq_handle->flags & IRQF_SAMPLE_RANDOM)

		rand_initialize_irq(irq);

	

	/* enable interrupt */
@@ -270,7 +270,7 @@ asmlinkage void process_int(unsigned long vec, struct pt_regs *fp) 
		if (irq_list[vec]) {

			irq_list[vec]->handler(vec, irq_list[vec]->dev_id, fp);

			irq_list[vec]->count++;

			if (irq_list[vec]->flags & SA_SAMPLE_RANDOM)

			if (irq_list[vec]->flags & IRQF_SAMPLE_RANDOM)

				add_interrupt_randomness(vec);

		}

	} else {

include/asm-h8300/signal.h

+0 −2
Original line number Diff line number Diff line
@@ -74,7 +74,6 @@ typedef unsigned long sigset_t; 
 * SA_FLAGS values:

 *

 * SA_ONSTACK indicates that a registered stack_t will be used.

 * SA_INTERRUPT is a no-op, but left due to historical reasons. Use the

 * SA_RESTART flag to get restarting signals (which were the default long ago)

 * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop.

 * SA_RESETHAND clears the handler when the signal is delivered.
@@ -94,7 +93,6 @@ typedef unsigned long sigset_t; 


#define SA_NOMASK	SA_NODEFER

#define SA_ONESHOT	SA_RESETHAND

#define SA_INTERRUPT	0x20000000 /* dummy -- ignored */



#define SA_RESTORER	0x04000000