iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

m68k/irq: Kill irq_node_t typedef, always use struct irq_node

Browse Source 
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Geert Uytterhoeven 2011-04-17 21:39:08 +02:00
parent c288bf2533
commit 0dde595be6
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/m68k/include/asm/irq.h
View File

@ -75,13 +75,13 @@ struct pt_regs;
* This structure is used to chain together the ISRs for a particular * This structure is used to chain together the ISRs for a particular
* interrupt source (if it supports chaining). * interrupt source (if it supports chaining).
*/ */
typedef struct irq_node { struct irq_node {
irqreturn_t (*handler)(int, void *); irqreturn_t (*handler)(int, void *);
void *dev_id; void *dev_id;
struct irq_node *next; struct irq_node *next;
unsigned long flags; unsigned long flags;
const char *devname; const char *devname;
} irq_node_t; };
/* /*
* This structure has only 4 elements for speed reasons * This structure has only 4 elements for speed reasons
@ -105,9 +105,9 @@ extern unsigned int m68k_irq_startup(unsigned int);
extern void m68k_irq_shutdown(unsigned int); extern void m68k_irq_shutdown(unsigned int);
/* /*
* This function returns a new irq_node_t * This function returns a new struct irq_node
*/ */
extern irq_node_t *new_irq_node(void); extern struct irq_node *new_irq_node(void);
extern void m68k_setup_auto_interrupt(void (*handler)(unsigned int, struct pt_regs *)); extern void m68k_setup_auto_interrupt(void (*handler)(unsigned int, struct pt_regs *));
extern void m68k_setup_user_interrupt(unsigned int vec, unsigned int cnt, extern void m68k_setup_user_interrupt(unsigned int vec, unsigned int cnt,

6
arch/m68k/kernel/ints.c
View File

@ -70,7 +70,7 @@ static struct irq_chip user_irq_chip = {
}; };
#define NUM_IRQ_NODES 100 #define NUM_IRQ_NODES 100
static irq_node_t nodes[NUM_IRQ_NODES]; static struct irq_node nodes[NUM_IRQ_NODES];
/* /*
* void init_IRQ(void) * void init_IRQ(void)
@ -160,9 +160,9 @@ void m68k_setup_irq_chip(struct irq_chip *contr, unsigned int irq,
irq_chip[irq + i] = contr; irq_chip[irq + i] = contr;
} }
irq_node_t *new_irq_node(void) struct irq_node *new_irq_node(void)
{ {
irq_node_t *node; struct irq_node *node;
short i; short i;
for (node = nodes, i = NUM_IRQ_NODES-1; i >= 0; node++, i--) { for (node = nodes, i = NUM_IRQ_NODES-1; i >= 0; node++, i--) {