leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

delay: collect {m, n, u}delay declarations to include/linux/delay.h

Browse Source 
Currently, mdelay() and udelay() are declared in include/common.h,
while ndelay() in include/linux/compat.h.  It would be nice to
collect them into include/linux/delay.h like Linux.

While we are here, fix the ndelay() implementation; I used the
DIV_ROUND_UP() instead of (x)/1000 because it must wait *longer*
than the given period of time.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Masahiro Yamada 2016-12-28 00:35:59 +09:00 committed by Tom Rini
parent 4b105f6ca9
commit 5bc516ed66
4 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/common.h
View File

@ -22,6 +22,7 @@ typedef volatile unsigned char vu_char;
#include <errno.h>
#include <asm-offsets.h>
#include <linux/bitops.h>
#include <linux/delay.h>
#include <linux/types.h>
#include <linux/string.h>
#include <linux/stringify.h>
@ -779,7 +780,6 @@ uint64_t get_ticks(void);
void wait_ticks (unsigned long);
/* arch/$(ARCH)/lib/time.c */
void __udelay (unsigned long);
ulong usec2ticks (unsigned long usec);
ulong ticks2usec (unsigned long ticks);
int init_timebase (void);
@ -836,10 +836,6 @@ void qsort(void *base, size_t nmemb, size_t size,
int(*compar)(const void *, const void *));
int strcmp_compar(const void *, const void *);
/* lib/time.c */
void udelay (unsigned long);
void mdelay(unsigned long);
/* lib/uuid.c */
#include <uuid.h>

2
include/linux/compat.h
View File

@ -15,8 +15,6 @@ struct p_current{
extern struct p_current *current;
#define ndelay(x) udelay((x) < 1000 ? 1 : (x)/1000)
#define dev_dbg(dev, fmt, args...) \
debug(fmt, ##args)
#define dev_vdbg(dev, fmt, args...) \

24
include/linux/delay.h Normal file
View File

@ -0,0 +1,24 @@
/*
* SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _LINUX_DELAY_H
#define _LINUX_DELAY_H
#include <linux/kernel.h>
void __udelay(unsigned long usec);
void udelay(unsigned long usec);
static inline void mdelay(unsigned long msec)
{
while (msec--)
udelay(1000);
}
static inline void ndelay(unsigned long nsec)
{
udelay(DIV_ROUND_UP(nsec, 1000));
}
#endif /* defined(_LINUX_DELAY_H) */

6
lib/time.c
View File

@ -154,9 +154,3 @@ void udelay(unsigned long usec)
usec -= kv;
} while(usec);
}
void mdelay(unsigned long msec)
{
while (msec--)
udelay(1000);
}