diff options
author | Eric Miao <eric.miao@marvell.com> | 2008-08-08 02:33:29 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-09-26 18:43:21 -0400 |
commit | b40c6762ba7640be4bd0e1e1bfeb2c629bda9808 (patch) | |
tree | fd66b3044cb43eb334ac887b678f0d5237634046 /arch | |
parent | bea95d2a1295684d5e6c2754616eb7f5941c5a34 (diff) |
[ARM] pxa/idp: remove the unnecessary idp_init_irq()
TOUCH_PANEL_IRQ is never referenced, and set_irq_type() shouldn't
be called in this way, remove it, as well as the idp_init_irq(),
and use pxa25x_init_irq() instead.
Signed-off-by: Eric Miao <eric.miao@marvell.com>
Cc: Cliff Brake <cliff.brake@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-pxa/idp.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/arch/arm/mach-pxa/idp.c b/arch/arm/mach-pxa/idp.c index cbb14deea1a4..013b15baa034 100644 --- a/arch/arm/mach-pxa/idp.c +++ b/arch/arm/mach-pxa/idp.c | |||
@@ -184,14 +184,6 @@ static void __init idp_init(void) | |||
184 | pxa_set_mci_info(&idp_mci_platform_data); | 184 | pxa_set_mci_info(&idp_mci_platform_data); |
185 | } | 185 | } |
186 | 186 | ||
187 | static void __init idp_init_irq(void) | ||
188 | { | ||
189 | |||
190 | pxa25x_init_irq(); | ||
191 | |||
192 | set_irq_type(TOUCH_PANEL_IRQ, TOUCH_PANEL_IRQ_EDGE); | ||
193 | } | ||
194 | |||
195 | static struct map_desc idp_io_desc[] __initdata = { | 187 | static struct map_desc idp_io_desc[] __initdata = { |
196 | { | 188 | { |
197 | .virtual = IDP_COREVOLT_VIRT, | 189 | .virtual = IDP_COREVOLT_VIRT, |
@@ -218,7 +210,7 @@ MACHINE_START(PXA_IDP, "Vibren PXA255 IDP") | |||
218 | .phys_io = 0x40000000, | 210 | .phys_io = 0x40000000, |
219 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, | 211 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, |
220 | .map_io = idp_map_io, | 212 | .map_io = idp_map_io, |
221 | .init_irq = idp_init_irq, | 213 | .init_irq = pxa25x_init_irq, |
222 | .timer = &pxa_timer, | 214 | .timer = &pxa_timer, |
223 | .init_machine = idp_init, | 215 | .init_machine = idp_init, |
224 | MACHINE_END | 216 | MACHINE_END |