asm-generic: move archictures to common delay.h
This patch moves the in-tree architectures that were using the 'generic' delay.h over to using the header file in asm-generic. This is not done using the generic-y mechanism as none of these arch's have started using that mechanism yet. This is a trivial change to make later when the arch begins using generic-y. Note the subtle change to the avr32 and SH architectures where the argument to __const_udelay was previously using the rounded down constant value instead of the rounded up value. Signed-off-by: Jonas Bonn <jonas@southpole.se> Acked-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Hans-Christian Egtvedt <egtvedt@samfundet.no>
This commit is contained in:
parent
a87e553fab
commit
a4e05276a1
|
@ -1,26 +1 @@
|
||||||
#ifndef __ASM_AVR32_DELAY_H
|
#include <asm-generic/delay.h>
|
||||||
#define __ASM_AVR32_DELAY_H
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Copyright (C) 1993 Linus Torvalds
|
|
||||||
*
|
|
||||||
* Delay routines calling functions in arch/avr32/lib/delay.c
|
|
||||||
*/
|
|
||||||
|
|
||||||
extern void __bad_udelay(void);
|
|
||||||
extern void __bad_ndelay(void);
|
|
||||||
|
|
||||||
extern void __udelay(unsigned long usecs);
|
|
||||||
extern void __ndelay(unsigned long nsecs);
|
|
||||||
extern void __const_udelay(unsigned long xloops);
|
|
||||||
extern void __delay(unsigned long loops);
|
|
||||||
|
|
||||||
#define udelay(n) (__builtin_constant_p(n) ? \
|
|
||||||
((n) > 20000 ? __bad_udelay() : __const_udelay((n) * 0x10c6ul)) : \
|
|
||||||
__udelay(n))
|
|
||||||
|
|
||||||
#define ndelay(n) (__builtin_constant_p(n) ? \
|
|
||||||
((n) > 20000 ? __bad_ndelay() : __const_udelay((n) * 5ul)) : \
|
|
||||||
__ndelay(n))
|
|
||||||
|
|
||||||
#endif /* __ASM_AVR32_DELAY_H */
|
|
||||||
|
|
|
@ -1,26 +1 @@
|
||||||
#ifndef _ASM_M32R_DELAY_H
|
#include <asm-generic/delay.h>
|
||||||
#define _ASM_M32R_DELAY_H
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Copyright (C) 1993 Linus Torvalds
|
|
||||||
*
|
|
||||||
* Delay routines calling functions in arch/m32r/lib/delay.c
|
|
||||||
*/
|
|
||||||
|
|
||||||
extern void __bad_udelay(void);
|
|
||||||
extern void __bad_ndelay(void);
|
|
||||||
|
|
||||||
extern void __udelay(unsigned long usecs);
|
|
||||||
extern void __ndelay(unsigned long nsecs);
|
|
||||||
extern void __const_udelay(unsigned long xloops);
|
|
||||||
extern void __delay(unsigned long loops);
|
|
||||||
|
|
||||||
#define udelay(n) (__builtin_constant_p(n) ? \
|
|
||||||
((n) > 20000 ? __bad_udelay() : __const_udelay((n) * 0x10c7ul)) : \
|
|
||||||
__udelay(n))
|
|
||||||
|
|
||||||
#define ndelay(n) (__builtin_constant_p(n) ? \
|
|
||||||
((n) > 20000 ? __bad_ndelay() : __const_udelay((n) * 5ul)) : \
|
|
||||||
__ndelay(n))
|
|
||||||
|
|
||||||
#endif /* _ASM_M32R_DELAY_H */
|
|
||||||
|
|
|
@ -1,26 +1 @@
|
||||||
#ifndef __ASM_SH_DELAY_H
|
#include <asm-generic/delay.h>
|
||||||
#define __ASM_SH_DELAY_H
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Copyright (C) 1993 Linus Torvalds
|
|
||||||
*
|
|
||||||
* Delay routines calling functions in arch/sh/lib/delay.c
|
|
||||||
*/
|
|
||||||
|
|
||||||
extern void __bad_udelay(void);
|
|
||||||
extern void __bad_ndelay(void);
|
|
||||||
|
|
||||||
extern void __udelay(unsigned long usecs);
|
|
||||||
extern void __ndelay(unsigned long nsecs);
|
|
||||||
extern void __const_udelay(unsigned long xloops);
|
|
||||||
extern void __delay(unsigned long loops);
|
|
||||||
|
|
||||||
#define udelay(n) (__builtin_constant_p(n) ? \
|
|
||||||
((n) > 20000 ? __bad_udelay() : __const_udelay((n) * 0x10c6ul)) : \
|
|
||||||
__udelay(n))
|
|
||||||
|
|
||||||
#define ndelay(n) (__builtin_constant_p(n) ? \
|
|
||||||
((n) > 20000 ? __bad_ndelay() : __const_udelay((n) * 5ul)) : \
|
|
||||||
__ndelay(n))
|
|
||||||
|
|
||||||
#endif /* __ASM_SH_DELAY_H */
|
|
||||||
|
|
|
@ -1,30 +1,7 @@
|
||||||
#ifndef _ASM_X86_DELAY_H
|
#ifndef _ASM_X86_DELAY_H
|
||||||
#define _ASM_X86_DELAY_H
|
#define _ASM_X86_DELAY_H
|
||||||
|
|
||||||
/*
|
#include <asm-generic/delay.h>
|
||||||
* Copyright (C) 1993 Linus Torvalds
|
|
||||||
*
|
|
||||||
* Delay routines calling functions in arch/x86/lib/delay.c
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* Undefined functions to get compile-time errors */
|
|
||||||
extern void __bad_udelay(void);
|
|
||||||
extern void __bad_ndelay(void);
|
|
||||||
|
|
||||||
extern void __udelay(unsigned long usecs);
|
|
||||||
extern void __ndelay(unsigned long nsecs);
|
|
||||||
extern void __const_udelay(unsigned long xloops);
|
|
||||||
extern void __delay(unsigned long loops);
|
|
||||||
|
|
||||||
/* 0x10c7 is 2**32 / 1000000 (rounded up) */
|
|
||||||
#define udelay(n) (__builtin_constant_p(n) ? \
|
|
||||||
((n) > 20000 ? __bad_udelay() : __const_udelay((n) * 0x10c7ul)) : \
|
|
||||||
__udelay(n))
|
|
||||||
|
|
||||||
/* 0x5 is 2**32 / 1000000000 (rounded up) */
|
|
||||||
#define ndelay(n) (__builtin_constant_p(n) ? \
|
|
||||||
((n) > 20000 ? __bad_ndelay() : __const_udelay((n) * 5ul)) : \
|
|
||||||
__ndelay(n))
|
|
||||||
|
|
||||||
void use_tsc_delay(void);
|
void use_tsc_delay(void);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue