diff options
| author | Daniel Schwierzeck <daniel.schwierzeck@gmail.com> | 2013-11-09 00:30:14 +0100 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-11-11 09:46:41 -0500 |
| commit | d770f3961f44295509ad23b7f056d9a37b947601 (patch) | |
| tree | a5c33c7bdbe4012a89301c0570fb3f3ca387ad49 /lib/time.c | |
| parent | 60390d70be7336b2441f5f69bd4f5affa83d064d (diff) | |
time: fix gcc warnings on MIPS64
Commit 8dfafdde88eb3e71d5569846396ae67a91017232 introduced
new gcc warnings on MIPS64:
time.c: In function 'tick_to_time':
time.c:59:2: warning: comparison of distinct pointer types lacks a cast [enabled by default]
time.c:59:2: warning: passing argument 1 of '__div64_32' from incompatible pointer type [enabled by default]
In file included from time.c:10:0:
./u-boot-mips/include/div64.h:22:17: note: expected 'uint64_t *' but argument is of type 'long long unsigned int *'
time.c: In function 'usec_to_tick':
time.c:76:2: warning: comparison of distinct pointer types lacks a cast [enabled by default]
time.c:76:2: warning: passing argument 1 of '__div64_32' from incompatible pointer type [enabled by default]
In file included from time.c:10:0:
./u-boot-mips/include/div64.h:22:17: note: expected 'uint64_t *' but argument is of type 'long long unsigned int *'
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
Diffstat (limited to 'lib/time.c')
| -rw-r--r-- | lib/time.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/time.c b/lib/time.c index 111b493a42..09bb05a24d 100644 --- a/lib/time.c +++ b/lib/time.c @@ -51,7 +51,7 @@ unsigned long long __weak notrace get_ticks(void) return ((unsigned long long)gd->timebase_h << 32) | gd->timebase_l; } -static unsigned long long notrace tick_to_time(unsigned long long tick) +static unsigned long long notrace tick_to_time(uint64_t tick) { unsigned int div = get_tbclk(); @@ -71,7 +71,7 @@ unsigned long __weak notrace timer_get_us(void) } static unsigned long long usec_to_tick(unsigned long usec) { - unsigned long long tick = usec * get_tbclk(); + uint64_t tick = usec * get_tbclk(); usec *= get_tbclk(); do_div(tick, 1000000); return tick; |