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/include | |
| parent | e504c4b6076d9ec1caccaac65803fe3fc29afec8 (diff) | |
| download | talos-obmc-linux-8102f47ab5fcffc50f3ff94ca9b9073c12c18cc7.tar.gz talos-obmc-linux-8102f47ab5fcffc50f3ff94ca9b9073c12c18cc7.zip | |
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/include')
| -rw-r--r-- | arch/xtensa/include/asm/delay.h | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/arch/xtensa/include/asm/delay.h b/arch/xtensa/include/asm/delay.h index 61fc5faeb46c..3899610c1dff 100644 --- a/arch/xtensa/include/asm/delay.h +++ b/arch/xtensa/include/asm/delay.h @@ -12,7 +12,7 @@ #ifndef _XTENSA_DELAY_H #define _XTENSA_DELAY_H -#include <asm/processor.h> +#include <asm/timex.h> #include <asm/param.h> extern unsigned long loops_per_jiffy; @@ -24,24 +24,17 @@ static inline void __delay(unsigned long loops) : "=r" (loops) : "0" (loops)); } -static __inline__ u32 xtensa_get_ccount(void) -{ - u32 ccount; - asm volatile ("rsr %0, ccount\n" : "=r" (ccount)); - return ccount; -} - /* For SMP/NUMA systems, change boot_cpu_data to something like * local_cpu_data->... where local_cpu_data points to the current * cpu. */ static __inline__ void udelay (unsigned long usecs) { - unsigned long start = xtensa_get_ccount(); + unsigned long start = get_ccount(); unsigned long cycles = usecs * (loops_per_jiffy / (1000000UL / HZ)); /* Note: all variables are unsigned (can wrap around)! */ - while (((unsigned long)xtensa_get_ccount()) - start < cycles) + while (((unsigned long)get_ccount()) - start < cycles) ; } |
