git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull button into test branch
[pandora-kernel.git]
/
arch
/
sparc
/
kernel
/
irq.c
diff --git
a/arch/sparc/kernel/irq.c
b/arch/sparc/kernel/irq.c
index
ae4dfc8
..
5b4841d
100644
(file)
--- a/
arch/sparc/kernel/irq.c
+++ b/
arch/sparc/kernel/irq.c
@@
-134,8
+134,8
@@
static void irq_panic(void)
prom_halt();
}
prom_halt();
}
-void (*sparc_init_timers)(irq
return_t (*)(int, void *)
) =
- (void (*)(irq
return_t (*)(int, void *)
)) irq_panic;
+void (*sparc_init_timers)(irq
_handler_t
) =
+ (void (*)(irq
_handler_t
)) irq_panic;
/*
* Dave Redman (djhr@tadpole.co.uk)
/*
* Dave Redman (djhr@tadpole.co.uk)
@@
-351,7
+351,7
@@
void handler_irq(int irq, struct pt_regs * regs)
}
#ifdef CONFIG_BLK_DEV_FD
}
#ifdef CONFIG_BLK_DEV_FD
-extern void floppy_interrupt(int irq, void *dev_id)
+extern void floppy_interrupt(int irq, void *dev_id)
;
void sparc_floppy_irq(int irq, void *dev_id, struct pt_regs *regs)
{
void sparc_floppy_irq(int irq, void *dev_id, struct pt_regs *regs)
{
@@
-376,7
+376,7
@@
void sparc_floppy_irq(int irq, void *dev_id, struct pt_regs *regs)
* thus no sharing possible.
*/
int request_fast_irq(unsigned int irq,
* thus no sharing possible.
*/
int request_fast_irq(unsigned int irq,
- irq
return_t (*handler)(int, void *)
,
+ irq
_handler_t handler
,
unsigned long irqflags, const char *devname)
{
struct irqaction *action;
unsigned long irqflags, const char *devname)
{
struct irqaction *action;
@@
-425,7
+425,7
@@
int request_fast_irq(unsigned int irq,
}
if (action == NULL)
}
if (action == NULL)
- action =
(struct irqaction *)
kmalloc(sizeof(struct irqaction),
+ action = kmalloc(sizeof(struct irqaction),
GFP_ATOMIC);
if (!action) {
GFP_ATOMIC);
if (!action) {
@@
-475,7
+475,7
@@
out:
}
int request_irq(unsigned int irq,
}
int request_irq(unsigned int irq,
- irq
return_t (*handler)(int, void *)
,
+ irq
_handler_t handler
,
unsigned long irqflags, const char * devname, void *dev_id)
{
struct irqaction * action, **actionp;
unsigned long irqflags, const char * devname, void *dev_id)
{
struct irqaction * action, **actionp;
@@
-485,7
+485,7
@@
int request_irq(unsigned int irq,
if (sparc_cpu_model == sun4d) {
extern int sun4d_request_irq(unsigned int,
if (sparc_cpu_model == sun4d) {
extern int sun4d_request_irq(unsigned int,
- irq
return_t (*)(int, void *)
,
+ irq
_handler_t
,
unsigned long, const char *, void *);
return sun4d_request_irq(irq, handler, irqflags, devname, dev_id);
}
unsigned long, const char *, void *);
return sun4d_request_irq(irq, handler, irqflags, devname, dev_id);
}
@@
-528,7
+528,7
@@
int request_irq(unsigned int irq,
}
if (action == NULL)
}
if (action == NULL)
- action =
(struct irqaction *)
kmalloc(sizeof(struct irqaction),
+ action = kmalloc(sizeof(struct irqaction),
GFP_ATOMIC);
if (!action) {
GFP_ATOMIC);
if (!action) {