diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-23 18:57:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-23 18:57:39 -0700 |
| commit | 25c263542ddf9396012b6a6fa2b327d304f7f9a3 (patch) | |
| tree | d7258f81da125b0bf4a2ce0ede2e79db38a7ed04 /arch | |
| parent | d8581969904b8a72db726c4b9090234c0f0bb18f (diff) | |
| parent | 7c2399756ab8ccb2c57da4630b4aa4a1d61b3846 (diff) | |
| download | blackbird-obmc-linux-25c263542ddf9396012b6a6fa2b327d304f7f9a3.tar.gz blackbird-obmc-linux-25c263542ddf9396012b6a6fa2b327d304f7f9a3.zip | |
Merge branch 'irq-upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6
* 'irq-upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
[SPARC, XEN, NET/CXGB3] use irq_handler_t where appropriate
drivers/char/riscom8: clean up irq handling
isdn/sc: irq handler clean
isdn/act2000: fix major bug. clean irq handler.
char/pcmcia/synclink_cs: trim trailing whitespace
drivers/char/ip2: separate polling and irq-driven work entry points
drivers/char/ip2: split out irq core logic into separate function
[NETDRVR] lib82596, netxen: delete pointless tests from irq handler
Eliminate pointless casts from void* in a few driver irq handlers.
[PARPORT] Remove unused 'irq' argument from parport irq functions
[PARPORT] Kill useful 'irq' arg from parport_{generic_irq,ieee1284_interrupt}
[PARPORT] Consolidate code copies into a single generic irq handler
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sparc/kernel/irq.c | 4 | ||||
| -rw-r--r-- | arch/x86/xen/events.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/sparc/kernel/irq.c b/arch/sparc/kernel/irq.c index 722d67d32961..e1e24f31aa54 100644 --- a/arch/sparc/kernel/irq.c +++ b/arch/sparc/kernel/irq.c @@ -479,7 +479,7 @@ EXPORT_SYMBOL(pdma_areasize); extern void floppy_hardint(void); -static irqreturn_t (*floppy_irq_handler)(int irq, void *dev_id); +static irq_handler_t floppy_irq_handler; void sparc_floppy_irq(int irq, void *dev_id, struct pt_regs *regs) { @@ -500,7 +500,7 @@ void sparc_floppy_irq(int irq, void *dev_id, struct pt_regs *regs) } int sparc_floppy_request_irq(int irq, unsigned long flags, - irqreturn_t (*irq_handler)(int irq, void *)) + irq_handler_t irq_handler) { floppy_irq_handler = irq_handler; return request_fast_irq(irq, floppy_hardint, flags, "floppy"); diff --git a/arch/x86/xen/events.c b/arch/x86/xen/events.c index da1b173547a1..6d1da5809e6f 100644 --- a/arch/x86/xen/events.c +++ b/arch/x86/xen/events.c @@ -383,7 +383,7 @@ static void unbind_from_irq(unsigned int irq) } int bind_evtchn_to_irqhandler(unsigned int evtchn, - irqreturn_t (*handler)(int, void *), + irq_handler_t handler, unsigned long irqflags, const char *devname, void *dev_id) { @@ -402,7 +402,7 @@ int bind_evtchn_to_irqhandler(unsigned int evtchn, EXPORT_SYMBOL_GPL(bind_evtchn_to_irqhandler); int bind_virq_to_irqhandler(unsigned int virq, unsigned int cpu, - irqreturn_t (*handler)(int, void *), + irq_handler_t handler, unsigned long irqflags, const char *devname, void *dev_id) { unsigned int irq; |
