diff options
| author | Chunyan Zhang <zhang.chunyan@linaro.org> | 2015-01-08 12:01:30 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-01-11 21:39:40 -0500 |
| commit | 4c3bd197a0f9b98343c5a6533e76a259271855b4 (patch) | |
| tree | ffbcb7d4aa1c1173ed25aa73cc1dde58f3ef03b2 /drivers/net/irda/nsc-ircc.h | |
| parent | ca98278a14b76916cd09c2c899c21c29a0748d15 (diff) | |
| download | linux-stable-4c3bd197a0f9b98343c5a6533e76a259271855b4.tar.gz linux-stable-4c3bd197a0f9b98343c5a6533e76a259271855b4.tar.bz2 linux-stable-4c3bd197a0f9b98343c5a6533e76a259271855b4.zip | |
irda: nsc-ircc: Replace timeval with ktime_t
The nsc ircc driver uses 'timeval', which we try to remove in the kernel
because all 32-bit time types will break in the year 2038.
This patch also changes do_gettimeofday() to ktime_get() accordingly,
since ktime_get returns a ktime_t, but do_gettimeofday returns a
struct timeval, and the other reason is that ktime_get() uses
the monotonic clock.
This patch uses ktime_us_delta to get the elapsed time, and in this
way it no longer needs to check for the overflow, because
ktime_us_delta returns time difference of microsecond.
Signed-off-by: Chunyan Zhang <zhang.chunyan@linaro.org>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/irda/nsc-ircc.h')
| -rw-r--r-- | drivers/net/irda/nsc-ircc.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/irda/nsc-ircc.h b/drivers/net/irda/nsc-ircc.h index 32fa58211fad..7be5acb56532 100644 --- a/drivers/net/irda/nsc-ircc.h +++ b/drivers/net/irda/nsc-ircc.h @@ -28,7 +28,7 @@ #ifndef NSC_IRCC_H #define NSC_IRCC_H -#include <linux/time.h> +#include <linux/ktime.h> #include <linux/spinlock.h> #include <linux/pm.h> @@ -263,8 +263,7 @@ struct nsc_ircc_cb { __u8 ier; /* Interrupt enable register */ - struct timeval stamp; - struct timeval now; + ktime_t stamp; spinlock_t lock; /* For serializing operations */ |