diff options
author | David S. Miller <davem@davemloft.net> | 2015-01-11 21:40:07 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-01-11 21:40:07 -0500 |
commit | ef5ba4aff9b55a4cf51e83af3f4dbc5cb4e471fa (patch) | |
tree | 12931bcf7d7bbdb8c6fe58a42b23de4d5e925bef /drivers/net/irda/vlsi_ir.h | |
parent | Merge branch 'sti_drivers' (diff) | |
parent | irda: vlsi_ir: Replace timeval with ktime_t (diff) | |
download | linux-dev-ef5ba4aff9b55a4cf51e83af3f4dbc5cb4e471fa.tar.xz linux-dev-ef5ba4aff9b55a4cf51e83af3f4dbc5cb4e471fa.zip |
Merge branch 'irda-next'
Chunyan Zhang says:
====================
irda: Use ktime_t instead of timeval
This patch-set removed all uses of timeval and used ktime_t instead if
needed, since 32-bit time types will break in the year 2038.
This patch-set also used the ktime_xxx functions accordingly.
e.g.
* Used ktime_get to get the current time instead of do_gettimeofday.
* And, used ktime_us_delta to get the elapsed time directly.
====================
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; |