Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a4e05276 authored by Jonas Bonn's avatar Jonas Bonn
Browse files

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: default avatarJonas Bonn <jonas@southpole.se>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarHans-Christian Egtvedt <egtvedt@samfundet.no>
parent a87e553f

arch/avr32/include/asm/delay.h

+1 −26
Original line number Diff line number Diff line 
#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>

arch/m32r/include/asm/delay.h

+1 −26
Original line number Diff line number Diff line 
#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>

arch/sh/include/asm/delay.h

+1 −26
Original line number Diff line number Diff line 
#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>

arch/x86/include/asm/delay.h

+1 −24
Original line number Diff line number Diff line 
#ifndef _ASM_X86_DELAY_H

#define _ASM_X86_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))

#include <asm-generic/delay.h>



void use_tsc_delay(void);