* [U-Boot] [PATCH] time: fix gcc warnings on MIPS64
@ 2013-11-08 23:30 Daniel Schwierzeck
2013-11-11 19:13 ` [U-Boot] " Tom Rini
0 siblings, 1 reply; 2+ messages in thread
From: Daniel Schwierzeck @ 2013-11-08 23:30 UTC (permalink / raw)
To: u-boot
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>
---
lib/time.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/time.c b/lib/time.c
index 111b493..09bb05a 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;
--
1.8.3.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [U-Boot] time: fix gcc warnings on MIPS64
2013-11-08 23:30 [U-Boot] [PATCH] time: fix gcc warnings on MIPS64 Daniel Schwierzeck
@ 2013-11-11 19:13 ` Tom Rini
0 siblings, 0 replies; 2+ messages in thread
From: Tom Rini @ 2013-11-11 19:13 UTC (permalink / raw)
To: u-boot
On Sat, Nov 09, 2013 at 12:30:14AM +0100, Daniel Schwierzeck wrote:
> 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>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20131111/fcbd2bbd/attachment.pgp>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-11-11 19:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-11-08 23:30 [U-Boot] [PATCH] time: fix gcc warnings on MIPS64 Daniel Schwierzeck
2013-11-11 19:13 ` [U-Boot] " Tom Rini
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.