aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2010-05-06 21:01:28 -0400
committerBen Dooks <ben-linux@fluff.org>2010-05-06 21:01:28 -0400
commit0c3767b161a91eab5b23d602d374b9c070c067a9 (patch)
tree6f35fc80bdc1628e6ac5ae6f23c6b9bbe33e1ac0 /arch/arm
parent8a19ebb0938752af8da142c4731f310bb8f9d130 (diff)
ARM: n30: Just call s3c24xx_init_irq() directly from machine definition
The n30_init_irq() call is simply a call to s3c24xx_init_irq, so just remove it and update the machine definitions to call the IRQ initialision call directly. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-s3c2410/mach-n30.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/arm/mach-s3c2410/mach-n30.c b/arch/arm/mach-s3c2410/mach-n30.c
index dfa09eac160c..9e2565ad973d 100644
--- a/arch/arm/mach-s3c2410/mach-n30.c
+++ b/arch/arm/mach-s3c2410/mach-n30.c
@@ -552,11 +552,6 @@ static void __init n30_map_io(void)
552 s3c24xx_init_uarts(n30_uartcfgs, ARRAY_SIZE(n30_uartcfgs)); 552 s3c24xx_init_uarts(n30_uartcfgs, ARRAY_SIZE(n30_uartcfgs));
553} 553}
554 554
555static void __init n30_init_irq(void)
556{
557 s3c24xx_init_irq();
558}
559
560/* GPB3 is the line that controls the pull-up for the USB D+ line */ 555/* GPB3 is the line that controls the pull-up for the USB D+ line */
561 556
562static void __init n30_init(void) 557static void __init n30_init(void)
@@ -612,7 +607,7 @@ MACHINE_START(N30, "Acer-N30")
612 .boot_params = S3C2410_SDRAM_PA + 0x100, 607 .boot_params = S3C2410_SDRAM_PA + 0x100,
613 .timer = &s3c24xx_timer, 608 .timer = &s3c24xx_timer,
614 .init_machine = n30_init, 609 .init_machine = n30_init,
615 .init_irq = n30_init_irq, 610 .init_irq = s3c24xx_init_irq,
616 .map_io = n30_map_io, 611 .map_io = n30_map_io,
617MACHINE_END 612MACHINE_END
618 613
@@ -624,6 +619,6 @@ MACHINE_START(N35, "Acer-N35")
624 .boot_params = S3C2410_SDRAM_PA + 0x100, 619 .boot_params = S3C2410_SDRAM_PA + 0x100,
625 .timer = &s3c24xx_timer, 620 .timer = &s3c24xx_timer,
626 .init_machine = n30_init, 621 .init_machine = n30_init,
627 .init_irq = n30_init_irq, 622 .init_irq = s3c24xx_init_irq,
628 .map_io = n30_map_io, 623 .map_io = n30_map_io,
629MACHINE_END 624MACHINE_END