From: Jens Axboe <axboe@fb.com>
Date: Fri, 29 Jul 2016 14:35:28 +0000 (-0600)
Subject: gettime: remove unneeded 'ret' in {utime,mtime}_since()
X-Git-Tag: fio-2.14~74
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=20ac4e77e5c8e0b17730fd8761abdf1b65fc1f15

gettime: remove unneeded 'ret' in {utime,mtime}_since()

Signed-off-by: Jens Axboe <axboe@fb.com>
---

diff --git a/gettime.c b/gettime.c
index 964a52fa..73b48b04 100644
--- a/gettime.c
+++ b/gettime.c
@@ -382,7 +382,6 @@ void fio_clock_init(void)
 uint64_t utime_since(const struct timeval *s, const struct timeval *e)
 {
 	long sec, usec;
-	uint64_t ret;
 
 	sec = e->tv_sec - s->tv_sec;
 	usec = e->tv_usec - s->tv_usec;
@@ -397,9 +396,7 @@ uint64_t utime_since(const struct timeval *s, const struct timeval *e)
 	if (sec < 0 || (sec == 0 && usec < 0))
 		return 0;
 
-	ret = sec * 1000000ULL + usec;
-
-	return ret;
+	return usec + (sec * 1000000);
 }
 
 uint64_t utime_since_now(const struct timeval *s)
@@ -412,7 +409,7 @@ uint64_t utime_since_now(const struct timeval *s)
 
 uint64_t mtime_since(const struct timeval *s, const struct timeval *e)
 {
-	long sec, usec, ret;
+	long sec, usec;
 
 	sec = e->tv_sec - s->tv_sec;
 	usec = e->tv_usec - s->tv_usec;
@@ -426,9 +423,7 @@ uint64_t mtime_since(const struct timeval *s, const struct timeval *e)
 
 	sec *= 1000;
 	usec /= 1000;
-	ret = sec + usec;
-
-	return ret;
+	return sec + usec;
 }
 
 uint64_t mtime_since_now(const struct timeval *s)