From: Geert Uytterhoeven <geert+renesas@glider.be>
To: linux-sh@vger.kernel.org
Subject: [PATCH 2/2] ARM: shmobile: sh73a0: Remove wrapper sh73a0_init_delay()
Date: Fri, 17 Oct 2014 12:24:39 +0000 [thread overview]
Message-ID: <1413548679-12391-2-git-send-email-geert+renesas@glider.be> (raw)
In-Reply-To: <1370533092-23555-3-git-send-email-g.liakhovetski@gmx.de>
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>
---
arch/arm/mach-shmobile/setup-sh73a0.c | 9 ++-------
arch/arm/mach-shmobile/sh73a0.h | 1 -
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 b7bd8e5096687960..0754b121ae836e75 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)
ARRAY_SIZE(sh73a0_late_devices));
}
-void __init sh73a0_init_delay(void)
-{
- shmobile_init_delay();
-}
-
/* do nothing for !CONFIG_SMP or !CONFIG_HAVE_TWD */
void __init __weak sh73a0_register_twd(void) { }
void __init sh73a0_earlytimer_init(void)
{
- sh73a0_init_delay();
+ shmobile_init_delay();
sh73a0_clock_init();
shmobile_earlytimer_init();
sh73a0_register_twd();
@@ -783,7 +778,7 @@ static const char *sh73a0_boards_compat_dt[] __initdata = {
DT_MACHINE_START(SH73A0_DT, "Generic SH73A0 (Flattened Device Tree)")
.smp = smp_ops(sh73a0_smp_ops),
.map_io = sh73a0_map_io,
- .init_early = sh73a0_init_delay,
+ .init_early = shmobile_init_delay,
.init_machine = sh73a0_add_standard_devices_dt,
.init_late = shmobile_init_late,
.dt_compat = sh73a0_boards_compat_dt,
diff --git a/arch/arm/mach-shmobile/sh73a0.h b/arch/arm/mach-shmobile/sh73a0.h
index 359b582dc270d6a9..f037c64b14fc0767 100644
--- a/arch/arm/mach-shmobile/sh73a0.h
+++ b/arch/arm/mach-shmobile/sh73a0.h
@@ -71,7 +71,6 @@ enum {
#define SH73A0_PINT0_IRQ(irq) ((irq) + 700)
#define SH73A0_PINT1_IRQ(irq) ((irq) + 732)
-extern void sh73a0_init_delay(void);
extern void sh73a0_init_irq(void);
extern void sh73a0_init_irq_dt(void);
extern void sh73a0_map_io(void);
--
1.9.1
next prev parent reply other threads:[~2014-10-17 12:24 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-06 15:38 [PATCH 2/2] ARM: shmobile: sh73a0: remove "0x" prefix from DT node names Guennadi Liakhovetski
2013-06-18 7:18 ` Simon Horman
2014-10-17 12:24 ` Geert Uytterhoeven [this message]
2014-10-23 10:24 ` [PATCH 2/2] ARM: shmobile: sh73a0: Remove wrapper sh73a0_init_delay() Laurent Pinchart
2014-10-24 2:09 ` Simon Horman
-- strict thread matches above, loose matches on Subject: below --
2014-10-29 5:00 [GIT PULL] Renesas ARM Based SoC Soc Cleanups for v3.19 Simon Horman
2014-10-29 5:00 ` [PATCH 2/2] ARM: shmobile: sh73a0: Remove wrapper sh73a0_init_delay() Simon Horman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1413548679-12391-2-git-send-email-geert+renesas@glider.be \
--to=geert+renesas@glider.be \
--cc=linux-sh@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).