iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

irda: ali-ircc: Replace timeval with ktime_t

Browse Source 
The ali 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:
Chunyan Zhang 2015-01-08 12:01:28 +08:00 committed by David S. Miller
parent 270d73c1c3
commit 9f61e309c5
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/net/irda/ali-ircc.c
View File

@ -1462,17 +1462,12 @@ static netdev_tx_t ali_ircc_fir_hard_xmit(struct sk_buff *skb,
if (mtt) if (mtt)
{ {
/* Check how much time we have used already */ /* Check how much time we have used already */
do_gettimeofday(&self->now); diff = ktime_us_delta(ktime_get(), self->stamp);
diff = self->now.tv_usec - self->stamp.tv_usec;
/* self->stamp is set from ali_ircc_dma_receive_complete() */ /* self->stamp is set from ali_ircc_dma_receive_complete() */
pr_debug("%s(), ******* diff = %d *******\n", pr_debug("%s(), ******* diff = %d *******\n",
__func__, diff); __func__, diff);
if (diff < 0)
diff += 1000000;
/* Check if the mtt is larger than the time we have /* Check if the mtt is larger than the time we have
* already used by all the protocol processing * already used by all the protocol processing
*/ */
@ -1884,7 +1879,7 @@ static int ali_ircc_dma_receive_complete(struct ali_ircc_cb *self)
* reduce the min turn time a bit since we will know * reduce the min turn time a bit since we will know
* how much time we have used for protocol processing * how much time we have used for protocol processing
*/ */
do_gettimeofday(&self->stamp); self->stamp = ktime_get();
skb = dev_alloc_skb(len+1); skb = dev_alloc_skb(len+1);
if (skb == NULL) if (skb == NULL)

5
drivers/net/irda/ali-ircc.h
View File

@ -22,7 +22,7 @@
#ifndef ALI_IRCC_H #ifndef ALI_IRCC_H
#define ALI_IRCC_H #define ALI_IRCC_H
#include <linux/time.h> #include <linux/ktime.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/pm.h> #include <linux/pm.h>
@ -209,8 +209,7 @@ struct ali_ircc_cb {
unsigned char rcvFramesOverflow; unsigned char rcvFramesOverflow;
struct timeval stamp; ktime_t stamp;
struct timeval now;
spinlock_t lock; /* For serializing operations */ spinlock_t lock; /* For serializing operations */