luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

irda: stir4200: Replace timeval with ktime_t

Browse Source 
The stir4200 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.

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:31 +08:00 committed by David S. Miller
parent 4c3bd197a0
commit 89a07e1726
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/net/irda/stir4200.c
View File

@ -40,6 +40,7 @@
#include <linux/moduleparam.h> #include <linux/moduleparam.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/ktime.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/time.h> #include <linux/time.h>
#include <linux/skbuff.h> #include <linux/skbuff.h>
@ -174,7 +175,7 @@ struct stir_cb {
__u8 *fifo_status; __u8 *fifo_status;
iobuff_t rx_buff; /* receive unwrap state machine */ iobuff_t rx_buff; /* receive unwrap state machine */
struct timeval rx_time; ktime_t rx_time;
int receiving; int receiving;
struct urb *rx_urb; struct urb *rx_urb;
}; };
@ -650,15 +651,12 @@ static int fifo_txwait(struct stir_cb *stir, int space)
static void turnaround_delay(const struct stir_cb *stir, long us) static void turnaround_delay(const struct stir_cb *stir, long us)
{ {
long ticks; long ticks;
struct timeval now;
if (us <= 0) if (us <= 0)
return; return;
do_gettimeofday(&now); us -= ktime_us_delta(ktime_get(), stir->rx_time);
if (now.tv_sec - stir->rx_time.tv_sec > 0)
us -= USEC_PER_SEC;
us -= now.tv_usec - stir->rx_time.tv_usec;
if (us < 10) if (us < 10)
return; return;
@ -824,7 +822,7 @@ static void stir_rcv_irq(struct urb *urb)
unwrap_chars(stir, urb->transfer_buffer, unwrap_chars(stir, urb->transfer_buffer,
urb->actual_length); urb->actual_length);
do_gettimeofday(&stir->rx_time); stir->rx_time = ktime_get();
} }
/* kernel thread is stopping receiver don't resubmit */ /* kernel thread is stopping receiver don't resubmit */
@ -876,7 +874,7 @@ static int stir_net_open(struct net_device *netdev)
skb_reserve(stir->rx_buff.skb, 1); skb_reserve(stir->rx_buff.skb, 1);
stir->rx_buff.head = stir->rx_buff.skb->data; stir->rx_buff.head = stir->rx_buff.skb->data;
do_gettimeofday(&stir->rx_time); stir->rx_time = ktime_get();
stir->rx_urb = usb_alloc_urb(0, GFP_KERNEL); stir->rx_urb = usb_alloc_urb(0, GFP_KERNEL);
if (!stir->rx_urb) if (!stir->rx_urb)