diff options
| author | Olof Johansson <olof@lixom.net> | 2014-11-04 14:39:18 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-11-04 14:39:18 -0800 |
| commit | 1d27f250308041f5a89132ae311c64b45e842576 (patch) | |
| tree | ddc452b23ad2cbe16b3dc6b22871dd8566d330ca /arch/arm/mach-shmobile/setup-r8a7778.c | |
| parent | a26c65112616353f193ef04973d38cfc06d963c6 (diff) | |
| parent | dac95365dc2683df55c4e221e2f669a056863307 (diff) | |
Merge tag 'renesas-soc-cleanups-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/cleanup
Merge "Renesas ARM Based SoC Soc Cleanups for v3.19" from Simon Horman:
* Remove sh73a0_init_delay and r8a7778_init_delay wrappers
* tag 'renesas-soc-cleanups-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: sh73a0: Remove wrapper sh73a0_init_delay()
ARM: shmobile: r8a7778: Remove wrapper r8a7778_init_delay()
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-shmobile/setup-r8a7778.c')
| -rw-r--r-- | arch/arm/mach-shmobile/setup-r8a7778.c | 7 |
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, |