summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-shmobile/setup-r8a7778.c
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert+renesas@glider.be>2014-10-17 14:24:38 +0200
committerSimon Horman <horms+renesas@verge.net.au>2014-10-24 06:06:53 +0200
commit92ee341e0b87551ab8838116782a4f3929108136 (patch)
tree6d02e8ad0f815d6223b8ea250de40ab725def85b /arch/arm/mach-shmobile/setup-r8a7778.c
parentLinux 3.18-rc1 (diff)
downloadlinux-92ee341e0b87551ab8838116782a4f3929108136.tar.xz
linux-92ee341e0b87551ab8838116782a4f3929108136.zip
ARM: shmobile: r8a7778: Remove wrapper r8a7778_init_delay()
r8a7778_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>
Diffstat (limited to 'arch/arm/mach-shmobile/setup-r8a7778.c')
-rw-r--r--arch/arm/mach-shmobile/setup-r8a7778.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/arm/mach-shmobile/setup-r8a7778.c b/arch/arm/mach-shmobile/setup-r8a7778.c
index 85fe016d6a87..97eac8703d4d 100644
--- a/arch/arm/mach-shmobile/setup-r8a7778.c
+++ b/arch/arm/mach-shmobile/setup-r8a7778.c
@@ -572,11 +572,6 @@ void __init r8a7778_init_irq_extpin(int irlm)
&irqpin_platform_data, sizeof(irqpin_platform_data));
}
-void __init r8a7778_init_delay(void)
-{
- shmobile_init_delay();
-}
-
#ifdef CONFIG_USE_OF
#define INT2SMSKCR0 0x82288 /* 0xfe782288 */
#define INT2SMSKCR1 0x8228c /* 0xfe78228c */
@@ -608,7 +603,7 @@ static const char *r8a7778_compat_dt[] __initdata = {
};
DT_MACHINE_START(R8A7778_DT, "Generic R8A7778 (Flattened Device Tree)")
- .init_early = r8a7778_init_delay,
+ .init_early = shmobile_init_delay,
.init_irq = r8a7778_init_irq_dt,
.init_late = shmobile_init_late,
.dt_compat = r8a7778_compat_dt,