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

[PATCH] m68knommu: fix up for the irq_handler_t changes

Browse Source 
Switch to using irq_handler_t for interrupt function handler pointers.

Change name of m68knommu's irq_hanlder_t data structure so it doesn't
clash with the common type (include/linux/interrupt.h).

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Greg Ungerer 2006-11-20 15:46:22 +10:00 committed by Linus Torvalds
parent 49a1cd00b5
commit ace5f1d425
6 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/m68knommu/kernel/setup.c
View File

@ -62,7 +62,7 @@ int (*mach_kbdrate) (struct kbd_repeat *);
void (*mach_kbd_leds) (unsigned int); void (*mach_kbd_leds) (unsigned int);
/* machine dependent irq functions */ /* machine dependent irq functions */
void (*mach_init_IRQ) (void); void (*mach_init_IRQ) (void);
irqreturn_t (*(*mach_default_handler)[]) (int, void *, struct pt_regs *); irq_handler_t mach_default_handler;
int (*mach_get_irq_list) (struct seq_file *, void *); int (*mach_get_irq_list) (struct seq_file *, void *);
void (*mach_process_int) (int irq, struct pt_regs *fp); void (*mach_process_int) (int irq, struct pt_regs *fp);
void (*mach_trap_init) (void); void (*mach_trap_init) (void);

2
arch/m68knommu/kernel/time.c
View File

@ -54,7 +54,7 @@ static irqreturn_t timer_interrupt(int irq, void *dummy, struct pt_regs * regs)
update_process_times(user_mode(regs)); update_process_times(user_mode(regs));
#endif #endif
if (current->pid) if (current->pid)
profile_tick(CPU_PROFILING, regs); profile_tick(CPU_PROFILING);
/* /*
* If we have an externally synchronized Linux clock, then update * If we have an externally synchronized Linux clock, then update

17
arch/m68knommu/platform/5307/ints.c
View File

@ -33,7 +33,7 @@
/* /*
* This table stores the address info for each vector handler. * This table stores the address info for each vector handler.
*/ */
irq_handler_t irq_list[SYS_IRQS]; struct irq_entry irq_list[SYS_IRQS];
#define NUM_IRQ_NODES 16 #define NUM_IRQ_NODES 16
static irq_node_t nodes[NUM_IRQ_NODES]; static irq_node_t nodes[NUM_IRQ_NODES];
@ -44,7 +44,7 @@ volatile unsigned int num_spurious;
unsigned int local_bh_count[NR_CPUS]; unsigned int local_bh_count[NR_CPUS];
unsigned int local_irq_count[NR_CPUS]; unsigned int local_irq_count[NR_CPUS];
static irqreturn_t default_irq_handler(int irq, void *ptr, struct pt_regs *regs) static irqreturn_t default_irq_handler(int irq, void *ptr)
{ {
#if 1 #if 1
printk(KERN_INFO "%s(%d): default irq handler vec=%d [0x%x]\n", printk(KERN_INFO "%s(%d): default irq handler vec=%d [0x%x]\n",
@ -70,7 +70,7 @@ void __init init_IRQ(void)
for (i = 0; i < SYS_IRQS; i++) { for (i = 0; i < SYS_IRQS; i++) {
if (mach_default_handler) if (mach_default_handler)
irq_list[i].handler = (*mach_default_handler)[i]; irq_list[i].handler = mach_default_handler;
else else
irq_list[i].handler = default_irq_handler; irq_list[i].handler = default_irq_handler;
irq_list[i].flags = IRQ_FLG_STD; irq_list[i].flags = IRQ_FLG_STD;
@ -100,7 +100,7 @@ irq_node_t *new_irq_node(void)
int request_irq( int request_irq(
unsigned int irq, unsigned int irq,
irqreturn_t (*handler)(int, void *, struct pt_regs *), irq_handler_t handler,
unsigned long flags, unsigned long flags,
const char *devname, const char *devname,
void *dev_id) void *dev_id)
@ -157,7 +157,7 @@ void free_irq(unsigned int irq, void *dev_id)
} }
if (mach_default_handler) if (mach_default_handler)
irq_list[irq].handler = (*mach_default_handler)[irq]; irq_list[irq].handler = mach_default_handler;
else else
irq_list[irq].handler = default_irq_handler; irq_list[irq].handler = default_irq_handler;
irq_list[irq].flags = IRQ_FLG_STD; irq_list[irq].flags = IRQ_FLG_STD;
@ -168,8 +168,7 @@ void free_irq(unsigned int irq, void *dev_id)
EXPORT_SYMBOL(free_irq); EXPORT_SYMBOL(free_irq);
int sys_request_irq(unsigned int irq, int sys_request_irq(unsigned int irq, irq_handler_t handler,
irqreturn_t (*handler)(int, void *, struct pt_regs *),
unsigned long flags, const char *devname, void *dev_id) unsigned long flags, const char *devname, void *dev_id)
{ {
if (irq > IRQ7) { if (irq > IRQ7) {
@ -211,7 +210,7 @@ void sys_free_irq(unsigned int irq, void *dev_id)
printk(KERN_WARNING "%s: Removing probably wrong IRQ %d from %s\n", printk(KERN_WARNING "%s: Removing probably wrong IRQ %d from %s\n",
__FUNCTION__, irq, irq_list[irq].devname); __FUNCTION__, irq, irq_list[irq].devname);
irq_list[irq].handler = (*mach_default_handler)[irq]; irq_list[irq].handler = mach_default_handler;
irq_list[irq].flags = 0; irq_list[irq].flags = 0;
irq_list[irq].dev_id = NULL; irq_list[irq].dev_id = NULL;
irq_list[irq].devname = NULL; irq_list[irq].devname = NULL;
@ -241,7 +240,7 @@ asmlinkage void process_int(unsigned long vec, struct pt_regs *fp)
if (vec >= VEC_INT1 && vec <= VEC_INT7) { if (vec >= VEC_INT1 && vec <= VEC_INT7) {
vec -= VEC_SPUR; vec -= VEC_SPUR;
kstat_cpu(0).irqs[vec]++; kstat_cpu(0).irqs[vec]++;
irq_list[vec].handler(vec, irq_list[vec].dev_id, fp); irq_list[vec].handler(vec, irq_list[vec].dev_id);
} else { } else {
if (mach_process_int) if (mach_process_int)
mach_process_int(vec, fp); mach_process_int(vec, fp);

1
include/asm-m68knommu/irq_regs.h Normal file
View File

@ -0,0 +1 @@
#include <asm-generic/irq_regs.h>

8
include/asm-m68knommu/irqnode.h
View File

@ -8,7 +8,7 @@
* interrupt source (if it supports chaining). * interrupt source (if it supports chaining).
*/ */
typedef struct irq_node { typedef struct irq_node {
irqreturn_t (*handler)(int, void *, struct pt_regs *); irq_handler_t handler;
unsigned long flags; unsigned long flags;
void *dev_id; void *dev_id;
const char *devname; const char *devname;
@ -18,12 +18,12 @@ typedef struct irq_node {
/* /*
* This structure has only 4 elements for speed reasons * This structure has only 4 elements for speed reasons
*/ */
typedef struct irq_handler { struct irq_entry {
irqreturn_t (*handler)(int, void *, struct pt_regs *); irq_handler_t handler;
unsigned long flags; unsigned long flags;
void *dev_id; void *dev_id;
const char *devname; const char *devname;
} irq_handler_t; };
/* count of spurious interrupts */ /* count of spurious interrupts */
extern volatile unsigned int num_spurious; extern volatile unsigned int num_spurious;

2
include/asm-m68knommu/machdep.h
View File

@ -18,7 +18,7 @@ extern int (*mach_kbdrate) (struct kbd_repeat *);
extern void (*mach_kbd_leds) (unsigned int); extern void (*mach_kbd_leds) (unsigned int);
/* machine dependent irq functions */ /* machine dependent irq functions */
extern void (*mach_init_IRQ) (void); extern void (*mach_init_IRQ) (void);
extern irqreturn_t (*(*mach_default_handler)[]) (int, void *, struct pt_regs *); extern irq_handler_t mach_default_handler;
extern int (*mach_request_irq) (unsigned int irq, void (*handler)(int, void *, struct pt_regs *), extern int (*mach_request_irq) (unsigned int irq, void (*handler)(int, void *, struct pt_regs *),
unsigned long flags, const char *devname, void *dev_id); unsigned long flags, const char *devname, void *dev_id);
extern void (*mach_free_irq) (unsigned int irq, void *dev_id); extern void (*mach_free_irq) (unsigned int irq, void *dev_id);