summaryrefslogtreecommitdiffstats
path: root/drivers/mtd/tests/torturetest.c
diff options
context:
space:
mode:
authorShraddha Barke <shraddha.6596@gmail.com>2015-10-22 16:59:54 +0200
committerBrian Norris <computersforpeace@gmail.com>2015-10-26 21:23:47 +0100
commitaf30c0a00aa0d086a820c2ec75544c07611834d7 (patch)
treedda7cb78cca78a868a9d6340d307bfee82f806be /drivers/mtd/tests/torturetest.c
parentmtd: fsmc_nand: Add BCH4 SW ECC support for SPEAr600 (diff)
downloadlinux-af30c0a00aa0d086a820c2ec75544c07611834d7.tar.xz
linux-af30c0a00aa0d086a820c2ec75544c07611834d7.zip
mtd: tests: Replace timeval with ktime_t
Changes the 32-bit time type timeval to the 64-bit time type ktime_t, since 32-bit systems using struct timeval will break in the year 2038. Correspondingly change do_gettimeofday() to ktime_get() since ktime_get returns a ktime_t, but do_gettimeofday returns a struct timeval.Here, ktime_get() is used instead of ktime_get_real() since ktime_get() uses monotonic clock. Signed-off-by: Shraddha Barke <shraddha.6596@gmail.com> Reviewed-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Diffstat (limited to 'drivers/mtd/tests/torturetest.c')
-rw-r--r--drivers/mtd/tests/torturetest.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/mtd/tests/torturetest.c b/drivers/mtd/tests/torturetest.c
index e5d6e6d9532f..93c2729c47b8 100644
--- a/drivers/mtd/tests/torturetest.c
+++ b/drivers/mtd/tests/torturetest.c
@@ -26,6 +26,7 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/init.h>
+#include <linux/ktime.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/err.h>
@@ -79,18 +80,18 @@ static unsigned char *check_buf;
static unsigned int erase_cycles;
static int pgsize;
-static struct timeval start, finish;
+static ktime_t start, finish;
static void report_corrupt(unsigned char *read, unsigned char *written);
static inline void start_timing(void)
{
- do_gettimeofday(&start);
+ start = ktime_get();
}
static inline void stop_timing(void)
{
- do_gettimeofday(&finish);
+ finish = ktime_get();
}
/*
@@ -333,8 +334,7 @@ static int __init tort_init(void)
long ms;
stop_timing();
- ms = (finish.tv_sec - start.tv_sec) * 1000 +
- (finish.tv_usec - start.tv_usec) / 1000;
+ ms = ktime_ms_delta(finish, start);
pr_info("%08u erase cycles done, took %lu "
"milliseconds (%lu seconds)\n",
erase_cycles, ms, ms / 1000);