V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

cosmetic, main: clean up declarations of abortboot 

Remove an unneeded prototype declaration from the top of main.c,
and use plain inline instead of __inline__ to please checkpatch.

Signed-off-by: Jason Hobbs <jason.hobbs@calxeda.com>
This commit is contained in:
Jason Hobbs 2011-06-29 06:25:14 +00:00 committed by Wolfgang Denk
parent f0ece9e934
commit 3c766dccb3
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/main.c
View File

@ -56,10 +56,6 @@ void update_tftp (void);
#define MAX_DELAY_STOP_STR 32 #define MAX_DELAY_STOP_STR 32
#if defined(CONFIG_BOOTDELAY) && (CONFIG_BOOTDELAY >= 0)
static int abortboot(int);
#endif
#undef DEBUG_PARSER #undef DEBUG_PARSER
char console_buffer[CONFIG_SYS_CBSIZE + 1]; /* console I/O buffer */ char console_buffer[CONFIG_SYS_CBSIZE + 1]; /* console I/O buffer */
@ -91,7 +87,7 @@ extern void mdm_init(void); /* defined in board.c */
*/ */
#if defined(CONFIG_BOOTDELAY) && (CONFIG_BOOTDELAY >= 0) #if defined(CONFIG_BOOTDELAY) && (CONFIG_BOOTDELAY >= 0)
# if defined(CONFIG_AUTOBOOT_KEYED) # if defined(CONFIG_AUTOBOOT_KEYED)
static __inline__ int abortboot(int bootdelay) static inline int abortboot(int bootdelay)
{ {
int abort = 0; int abort = 0;
uint64_t etime = endtick(bootdelay); uint64_t etime = endtick(bootdelay);
@ -205,7 +201,7 @@ static __inline__ int abortboot(int bootdelay)
static int menukey = 0; static int menukey = 0;
#endif #endif
static __inline__ int abortboot(int bootdelay) static inline int abortboot(int bootdelay)
{ {
int abort = 0; int abort = 0;