From: Marek Vasut <marek.vasut+renesas@gmail.com>
Date: Fri, 24 Aug 2018 19:23:04 +0000 (+0200)
Subject: sh: tmu: Inline tmu_timer_{start,stop}()
X-Git-Url: http://git.dujemihanovic.xyz/img/static/gitweb.css?a=commitdiff_plain;h=15f11fc6d72175ff5b7763f03d7b0d502efd24af;p=u-boot.git

sh: tmu: Inline tmu_timer_{start,stop}()

These functions are always called for timer = 0, so drop the
timer check. Since these functions are called from one place
only and they are reduced to one line of code, just inline
them.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
---

diff --git a/arch/sh/lib/time.c b/arch/sh/lib/time.c
index 302f6bed83..6273f39f21 100644
--- a/arch/sh/lib/time.c
+++ b/arch/sh/lib/time.c
@@ -16,6 +16,7 @@
 #include <sh_tmu.h>
 
 #define TCR_TPSC 0x07
+#define TSTR_STR0	BIT(0)
 
 static struct tmu_regs *tmu = (struct tmu_regs *)TMU_BASE;
 
@@ -29,26 +30,11 @@ unsigned long timer_read_counter(void)
 	return ~readl(&tmu->tcnt0);
 }
 
-static void tmu_timer_start(unsigned int timer)
-{
-	if (timer > 2)
-		return;
-	writeb(readb(&tmu->tstr) | (1 << timer), &tmu->tstr);
-}
-
-static void tmu_timer_stop(unsigned int timer)
-{
-	if (timer > 2)
-		return;
-	writeb(readb(&tmu->tstr) & ~(1 << timer), &tmu->tstr);
-}
-
 int timer_init(void)
 {
 	writew(readw(&tmu->tcr0) & ~TCR_TPSC, &tmu->tcr0);
-
-	tmu_timer_stop(0);
-	tmu_timer_start(0);
+	writeb(readb(&tmu->tstr) & ~TSTR_STR0, &tmu->tstr);
+	writeb(readb(&tmu->tstr) | TSTR_STR0, &tmu->tstr);
 
 	return 0;
 }