mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 17:30:02 +00:00
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>
This commit is contained in:
parent
ca98278a14
commit
4c3bd197a0
2 changed files with 4 additions and 8 deletions
|
@ -1501,10 +1501,7 @@ static netdev_tx_t nsc_ircc_hard_xmit_fir(struct sk_buff *skb,
|
|||
mtt = irda_get_mtt(skb);
|
||||
if (mtt) {
|
||||
/* Check how much time we have used already */
|
||||
do_gettimeofday(&self->now);
|
||||
diff = self->now.tv_usec - self->stamp.tv_usec;
|
||||
if (diff < 0)
|
||||
diff += 1000000;
|
||||
diff = ktime_us_delta(ktime_get(), self->stamp);
|
||||
|
||||
/* Check if the mtt is larger than the time we have
|
||||
* already used by all the protocol processing
|
||||
|
@ -1867,7 +1864,7 @@ static int nsc_ircc_dma_receive_complete(struct nsc_ircc_cb *self, int iobase)
|
|||
* reduce the min turn time a bit since we will know
|
||||
* how much time we have used for protocol processing
|
||||
*/
|
||||
do_gettimeofday(&self->stamp);
|
||||
self->stamp = ktime_get();
|
||||
|
||||
skb = dev_alloc_skb(len+1);
|
||||
if (skb == NULL) {
|
||||
|
|
|
@ -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 */
|
||||
|
||||
|
|
Loading…
Reference in a new issue