forked from Sricharanti/sricharan
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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 <[email protected]> Acked-by: Arnd Bergmann <[email protected]> Acked-by: Hans-Christian Egtvedt <[email protected]>
- Loading branch information
Jonas Bonn
committed
Jul 22, 2011
1 parent
a87e553
commit a4e0527
Showing
4 changed files
with
4 additions
and
102 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,26 +1 @@ | ||
#ifndef __ASM_AVR32_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 */ | ||
#include <asm-generic/delay.h> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,26 +1 @@ | ||
#ifndef _ASM_M32R_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 */ | ||
#include <asm-generic/delay.h> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,26 +1 @@ | ||
#ifndef __ASM_SH_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 */ | ||
#include <asm-generic/delay.h> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters