xtensa: cleanup ccount frequency tracking

Remove unused nsec_per_ccount, and rename ccount_per_jiffy to ccount_preq.

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Chris Zankel <chris@zankel.net>

5 files changed, 8 insertions, 12 deletions

diff --git a/arch/xtensa/include/asm/timex.h b/arch/xtensa/include/asm/timex.h
index c47989a0e3ad..69f901713fb6 100644
--- a/arch/xtensa/include/asm/timex.h
+++ b/arch/xtensa/include/asm/timex.h
@@ -36,9 +36,8 @@
 #endif
 
 #ifdef CONFIG_XTENSA_CALIBRATE_CCOUNT
-extern unsigned long ccount_per_jiffy;
-extern unsigned long nsec_per_ccount;
-#define CCOUNT_PER_JIFFY ccount_per_jiffy
+extern unsigned long ccount_freq;
+#define CCOUNT_PER_JIFFY (ccount_freq / HZ)
 #else
 #define CCOUNT_PER_JIFFY (CONFIG_XTENSA_CPU_CLOCK*(1000000UL/HZ))
 #endif
diff --git a/arch/xtensa/kernel/platform.c b/arch/xtensa/kernel/platform.c
index da827cbb2f59..1cf008284dd2 100644
--- a/arch/xtensa/kernel/platform.c
+++ b/arch/xtensa/kernel/platform.c
@@ -41,6 +41,6 @@ _F(void, pcibios_init, (void), { });
 _F(void, calibrate_ccount, (void),
 {
         pr_err("ERROR: Cannot calibrate cpu frequency! Assuming 10MHz.\n");
-        ccount_per_jiffy = 10 * (1000000UL/HZ);
+        ccount_freq = 10 * 1000000UL;
 });
 #endif
diff --git a/arch/xtensa/kernel/time.c b/arch/xtensa/kernel/time.c
index ffb474104311..a32bc2ea7982 100644
--- a/arch/xtensa/kernel/time.c
+++ b/arch/xtensa/kernel/time.c
@@ -28,8 +28,7 @@
 #include <asm/platform.h>
 
 #ifdef CONFIG_XTENSA_CALIBRATE_CCOUNT
-unsigned long ccount_per_jiffy;         /* per 1/HZ */
-unsigned long nsec_per_ccount;          /* nsec per ccount increment */
+unsigned long ccount_freq;              /* ccount Hz */
 #endif
 
 static cycle_t ccount_read(struct clocksource *cs)
@@ -57,8 +56,8 @@ void __init time_init(void)
 #ifdef CONFIG_XTENSA_CALIBRATE_CCOUNT
         printk("Calibrating CPU frequency ");
         platform_calibrate_ccount();
-        printk("%d.%02d MHz\n", (int)ccount_per_jiffy/(1000000/HZ),
-                        (int)(ccount_per_jiffy/(10000/HZ))%100);
+        printk("%d.%02d MHz\n", (int)ccount_freq/1000000,
+                        (int)(ccount_freq/10000)%100);
 #endif
         clocksource_register_hz(&ccount_clocksource, CCOUNT_PER_JIFFY * HZ);
 
diff --git a/arch/xtensa/platforms/xtfpga/setup.c b/arch/xtensa/platforms/xtfpga/setup.c
index c7ce62ff73f7..74bb74fa3f87 100644
--- a/arch/xtensa/platforms/xtfpga/setup.c
+++ b/arch/xtensa/platforms/xtfpga/setup.c
@@ -179,8 +179,7 @@ void __init platform_calibrate_ccount(void)
         if (!clk_freq)
                 clk_freq = *(long *)XTFPGA_CLKFRQ_VADDR;
 
-        ccount_per_jiffy = clk_freq / HZ;
-        nsec_per_ccount = 1000000000UL / clk_freq;
+        ccount_freq = clk_freq;
 }
 
 #endif
diff --git a/arch/xtensa/variants/s6000/delay.c b/arch/xtensa/variants/s6000/delay.c
index 54b2b573f166..baefd3a3c2aa 100644
--- a/arch/xtensa/variants/s6000/delay.c
+++ b/arch/xtensa/variants/s6000/delay.c
@@ -22,6 +22,5 @@ void platform_calibrate_ccount(void)
                         a = b;
         } while (--i >= 0);
         b -= a;
-        nsec_per_ccount = (LOOPS * 10000) / b;
-        ccount_per_jiffy = b * (100000UL / (LOOPS * HZ));
+        ccount_freq = b * (100000UL / LOOPS);
 }