xtensa: consolidate ccount access routines

Use get_ccount everywhere; remove xtensa_get_ccount.

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

1 files changed, 1 insertions, 2 deletions

diff --git a/arch/xtensa/variants/s6000/delay.c b/arch/xtensa/variants/s6000/delay.c
index baefd3a3c2aa..39154563ee17 100644
--- a/arch/xtensa/variants/s6000/delay.c
+++ b/arch/xtensa/variants/s6000/delay.c
@@ -1,4 +1,3 @@
-#include <asm/delay.h>
 #include <asm/timex.h>
 #include <asm/io.h>
 #include <variant/hardware.h>
@@ -17,7 +16,7 @@ void platform_calibrate_ccount(void)
                 "1:     l32i %0, %2, 0 ;"
                 "       beq %0, %1, 1b ;"
                 : "=&a"(u) : "a"(t), "a"(tstamp));
-                b = xtensa_get_ccount();
+                b = get_ccount();
                 if (i == LOOPS)
                         a = b;
         } while (--i >= 0);