Skip to content

Commit

Permalink
Fix __const_udelay declaration and definition mismatches
Browse files Browse the repository at this point in the history
The declaration and implementation of __const_udelay use different
names for the parameter on a number of architectures:

include/asm-avr32/delay.h:15:extern void __const_udelay(unsigned long usecs);
arch/avr32/lib/delay.c:39:inline void __const_udelay(unsigned long xloops)

include/asm-sh/delay.h:15:extern void __const_udelay(unsigned long usecs);
arch/sh/lib/delay.c:22:inline void __const_udelay(unsigned long xloops)

include/asm-m32r/delay.h:15:extern void __const_udelay(unsigned long usecs);
arch/m32r/lib/delay.c:58:void __const_udelay(unsigned long xloops)

include/asm-x86/delay.h:16:extern void __const_udelay(unsigned long usecs);
arch/x86/lib/delay_32.c:82:inline void __const_udelay(unsigned long xloops)
arch/x86/lib/delay_64.c:46:inline void __const_udelay(unsigned long xloops)

The units of the parameter isn't usecs, so that name is definitely
wrong.  It's also not exactly loops, so I suppose xloops is an OK
name.

This patch changes these names from usecs to xloops.

Signed-off-by: Jeff Dike <[email protected]>
Cc: Haavard Skinnemoen <[email protected]>
Cc: Paul Mundt <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Hirokazu Takata <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
cfd-36 authored and Linus Torvalds committed Feb 6, 2008
1 parent ed8485f commit 5ab24c7
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion include/asm-avr32/delay.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ extern void __bad_ndelay(void);

extern void __udelay(unsigned long usecs);
extern void __ndelay(unsigned long nsecs);
extern void __const_udelay(unsigned long usecs);
extern void __const_udelay(unsigned long xloops);
extern void __delay(unsigned long loops);

#define udelay(n) (__builtin_constant_p(n) ? \
Expand Down
2 changes: 1 addition & 1 deletion include/asm-m32r/delay.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ extern void __bad_ndelay(void);

extern void __udelay(unsigned long usecs);
extern void __ndelay(unsigned long nsecs);
extern void __const_udelay(unsigned long usecs);
extern void __const_udelay(unsigned long xloops);
extern void __delay(unsigned long loops);

#define udelay(n) (__builtin_constant_p(n) ? \
Expand Down
2 changes: 1 addition & 1 deletion include/asm-sh/delay.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ extern void __bad_ndelay(void);

extern void __udelay(unsigned long usecs);
extern void __ndelay(unsigned long nsecs);
extern void __const_udelay(unsigned long usecs);
extern void __const_udelay(unsigned long xloops);
extern void __delay(unsigned long loops);

#ifdef CONFIG_SUPERH32
Expand Down
2 changes: 1 addition & 1 deletion include/asm-x86/delay.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ extern void __bad_ndelay(void);

extern void __udelay(unsigned long usecs);
extern void __ndelay(unsigned long nsecs);
extern void __const_udelay(unsigned long usecs);
extern void __const_udelay(unsigned long xloops);
extern void __delay(unsigned long loops);

/* 0x10c7 is 2**32 / 1000000 (rounded up) */
Expand Down

0 comments on commit 5ab24c7

Please sign in to comment.