diff options
author | Baruch Siach <baruch@tkos.co.il> | 2013-06-17 11:29:44 +0300 |
---|---|---|
committer | Chris Zankel <chris@zankel.net> | 2013-07-08 01:11:37 -0700 |
commit | 8102f47ab5fcffc50f3ff94ca9b9073c12c18cc7 (patch) | |
tree | 48d788aac62e3036455d834d9df0d11dc0d543b5 /arch/xtensa/variants | |
parent | e504c4b6076d9ec1caccaac65803fe3fc29afec8 (diff) | |
download | linux-8102f47ab5fcffc50f3ff94ca9b9073c12c18cc7.tar.bz2 |
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>
Diffstat (limited to 'arch/xtensa/variants')
-rw-r--r-- | arch/xtensa/variants/s6000/delay.c | 3 |
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); |