From b9e25aced33eeb7279ccbaef198f28370cfb4e93 Mon Sep 17 00:00:00 2001 From: eric miao Date: Tue, 4 Mar 2008 14:19:58 +0800 Subject: [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 Signed-off-by: Russell King --- arch/arm/mach-pxa/irq.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'arch/arm/mach-pxa/irq.c') diff --git a/arch/arm/mach-pxa/irq.c b/arch/arm/mach-pxa/irq.c index cccc3ed3c67..fbff557bb22 100644 --- a/arch/arm/mach-pxa/irq.c +++ b/arch/arm/mach-pxa/irq.c @@ -51,7 +51,7 @@ static struct irq_chip pxa_internal_irq_chip = { .unmask = pxa_unmask_irq, }; -void __init pxa_init_irq(int irq_nr) +void __init pxa_init_irq(int irq_nr, set_wake_t fn) { int irq; @@ -70,12 +70,8 @@ void __init pxa_init_irq(int irq_nr) set_irq_handler(irq, handle_level_irq); set_irq_flags(irq, IRQF_VALID); } -} -void __init pxa_init_irq_set_wake(int (*set_wake)(unsigned int, unsigned int)) -{ - pxa_internal_irq_chip.set_wake = set_wake; - pxa_init_gpio_set_wake(set_wake); + pxa_internal_irq_chip.set_wake = fn; } #ifdef CONFIG_PM -- cgit v1.2.3-70-g09d2