aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert+renesas@glider.be>2014-10-17 08:24:39 -0400
committerSimon Horman <horms+renesas@verge.net.au>2014-10-24 00:07:01 -0400
commitdac95365dc2683df55c4e221e2f669a056863307 (patch)
tree9dbc81dce0e7b0466a2fd309544a1186ef8fb7e3
parent92ee341e0b87551ab8838116782a4f3929108136 (diff)
ARM: shmobile: sh73a0: Remove wrapper sh73a0_init_delay()
sh73a0_init_delay() just calls shmobile_init_delay(), hence replace calls to it by direct calls to shmobile_init_delay(). Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
-rw-r--r--arch/arm/mach-shmobile/setup-sh73a0.c9
-rw-r--r--arch/arm/mach-shmobile/sh73a0.h1
2 files changed, 2 insertions, 8 deletions
diff --git a/arch/arm/mach-shmobile/setup-sh73a0.c b/arch/arm/mach-shmobile/setup-sh73a0.c
index b7bd8e509668..0754b121ae83 100644
--- a/arch/arm/mach-shmobile/setup-sh73a0.c
+++ b/arch/arm/mach-shmobile/setup-sh73a0.c
@@ -740,17 +740,12 @@ void __init sh73a0_add_standard_devices(void)
740 ARRAY_SIZE(sh73a0_late_devices)); 740 ARRAY_SIZE(sh73a0_late_devices));
741} 741}
742 742
743void __init sh73a0_init_delay(void)
744{
745 shmobile_init_delay();
746}
747
748/* do nothing for !CONFIG_SMP or !CONFIG_HAVE_TWD */ 743/* do nothing for !CONFIG_SMP or !CONFIG_HAVE_TWD */
749void __init __weak sh73a0_register_twd(void) { } 744void __init __weak sh73a0_register_twd(void) { }
750 745
751void __init sh73a0_earlytimer_init(void) 746void __init sh73a0_earlytimer_init(void)
752{ 747{
753 sh73a0_init_delay(); 748 shmobile_init_delay();
754 sh73a0_clock_init(); 749 sh73a0_clock_init();
755 shmobile_earlytimer_init(); 750 shmobile_earlytimer_init();
756 sh73a0_register_twd(); 751 sh73a0_register_twd();
@@ -783,7 +778,7 @@ static const char *sh73a0_boards_compat_dt[] __initdata = {
783DT_MACHINE_START(SH73A0_DT, "Generic SH73A0 (Flattened Device Tree)") 778DT_MACHINE_START(SH73A0_DT, "Generic SH73A0 (Flattened Device Tree)")
784 .smp = smp_ops(sh73a0_smp_ops), 779 .smp = smp_ops(sh73a0_smp_ops),
785 .map_io = sh73a0_map_io, 780 .map_io = sh73a0_map_io,
786 .init_early = sh73a0_init_delay, 781 .init_early = shmobile_init_delay,
787 .init_machine = sh73a0_add_standard_devices_dt, 782 .init_machine = sh73a0_add_standard_devices_dt,
788 .init_late = shmobile_init_late, 783 .init_late = shmobile_init_late,
789 .dt_compat = sh73a0_boards_compat_dt, 784 .dt_compat = sh73a0_boards_compat_dt,
diff --git a/arch/arm/mach-shmobile/sh73a0.h b/arch/arm/mach-shmobile/sh73a0.h
index 359b582dc270..f037c64b14fc 100644
--- a/arch/arm/mach-shmobile/sh73a0.h
+++ b/arch/arm/mach-shmobile/sh73a0.h
@@ -71,7 +71,6 @@ enum {
71#define SH73A0_PINT0_IRQ(irq) ((irq) + 700) 71#define SH73A0_PINT0_IRQ(irq) ((irq) + 700)
72#define SH73A0_PINT1_IRQ(irq) ((irq) + 732) 72#define SH73A0_PINT1_IRQ(irq) ((irq) + 732)
73 73
74extern void sh73a0_init_delay(void);
75extern void sh73a0_init_irq(void); 74extern void sh73a0_init_irq(void);
76extern void sh73a0_init_irq_dt(void); 75extern void sh73a0_init_irq_dt(void);
77extern void sh73a0_map_io(void); 76extern void sh73a0_map_io(void);