diff options
author | Chunyan Zhang <zhang.chunyan@linaro.org> | 2015-01-08 12:01:32 +0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-01-11 21:39:40 -0500 |
commit | 497ec1f2a086878d6a42334eda72bfef079dd484 (patch) | |
tree | 12931bcf7d7bbdb8c6fe58a42b23de4d5e925bef /drivers/net/irda/vlsi_ir.h | |
parent | 89a07e1726534957fc987b39742048d592ec9aae (diff) | |
download | linux-next-497ec1f2a086878d6a42334eda72bfef079dd484.tar.gz |
irda: vlsi_ir: Replace timeval with ktime_t
The vlsi ir 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 of microsecond,
and uses div_s64_rem to get what seconds & microseconds time elapsed
for printing.
This patch also changes the function 'vlsi_hard_start_xmit' to do the
same things as the others drivers, that is passing the remaining time
into udelay() instead of looping until enough time has passed.
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/vlsi_ir.h')
-rw-r--r-- | drivers/net/irda/vlsi_ir.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/irda/vlsi_ir.h b/drivers/net/irda/vlsi_ir.h index f9119c6d2a09..f9db2ce4c5c6 100644 --- a/drivers/net/irda/vlsi_ir.h +++ b/drivers/net/irda/vlsi_ir.h @@ -723,7 +723,7 @@ typedef struct vlsi_irda_dev { void *virtaddr; struct vlsi_ring *tx_ring, *rx_ring; - struct timeval last_rx; + ktime_t last_rx; spinlock_t lock; struct mutex mtx; |