summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/generic.h
diff options
context:
space:
mode:
authoreric miao <eric.miao@marvell.com>2008-03-04 14:19:58 +0800
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-04-19 11:29:04 +0100
commitb9e25aced33eeb7279ccbaef198f28370cfb4e93 (patch)
tree149cac52a08fd81dbfbf611f96332f2e5341c58a /arch/arm/mach-pxa/generic.h
parentf6fb7af4768bc1ddc2349f6eaefedd746c8e4913 (diff)
downloadop-kernel-dev-b9e25aced33eeb7279ccbaef198f28370cfb4e93.zip
op-kernel-dev-b9e25aced33eeb7279ccbaef198f28370cfb4e93.tar.gz
[ARM] pxa: merge assignment of set_wake into pxa_init_{irq,gpio}()
To further clean up the GPIO and IRQ structure: 1. pxa_init_irq_gpio() and pxa_init_gpio() combines into a single function pxa_init_gpio() 2. assignment of set_wake merged into pxa_init_{irq,gpio}() as an argument Signed-off-by: eric miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-pxa/generic.h')
-rw-r--r--arch/arm/mach-pxa/generic.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/arm/mach-pxa/generic.h b/arch/arm/mach-pxa/generic.h
index 0e3e058..bd2a235 100644
--- a/arch/arm/mach-pxa/generic.h
+++ b/arch/arm/mach-pxa/generic.h
@@ -9,14 +9,13 @@
* published by the Free Software Foundation.
*/
+typedef int (*set_wake_t)(unsigned int, unsigned int);
+
struct sys_timer;
extern struct sys_timer pxa_timer;
-extern void __init pxa_init_irq(int irq_nr);
-extern void __init pxa_init_irq_gpio(int gpio_nr);
-extern void __init pxa_init_irq_set_wake(int (*set_wake)(unsigned int, unsigned int));
-extern void __init pxa_init_gpio_set_wake(int (*set_wake)(unsigned int, unsigned int));
-extern void __init pxa_init_gpio(int gpio_nr);
+extern void __init pxa_init_irq(int irq_nr, set_wake_t fn);
+extern void __init pxa_init_gpio(int gpio_nr, set_wake_t fn);
extern void __init pxa25x_init_irq(void);
extern void __init pxa27x_init_irq(void);
extern void __init pxa3xx_init_irq(void);
OpenPOWER on IntegriCloud