Merge branch '2019-12-02-master-imports'

[oweals/u-boot.git] / arch / xtensa / lib / time.c

diff --git a/arch/xtensa/lib/time.c b/arch/xtensa/lib/time.c
index 1332072ffe3d01f0761170f1a28e2aa3bdf83996..62bbe37b806272fe90616339a03f3e1628801c2e 100644 (file)
--- a/arch/xtensa/lib/time.c
+++ b/arch/xtensa/lib/time.c
@@ -1,10 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2008 - 2013 Tensilica Inc.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <linux/stringify.h>
 
@@ -104,10 +104,7 @@ unsigned long long get_ticks(void)
  */
 ulong get_tbclk(void)
 {
-       ulong tbclk;
-
-       tbclk = CONFIG_SYS_HZ;
-       return tbclk;
+       return CONFIG_SYS_HZ;
 }
 
 #if XCHAL_HAVE_CCOUNT