提交 2ae4b6b2 编写于 作者: A Amitoj Kaur Chawla 提交者: Stefan Richter

firewire: nosy: Replace timeval with timespec64

32 bit systems using 'struct timeval' will break in the year 2038, so
we replace the code appropriately. However, this driver is not broken
in 2038 since we are using only the microseconds portion of the
current time.

This patch replaces timeval with timespec64.
Signed-off-by: NAmitoj Kaur Chawla <amitoj1606@gmail.com>
Reviewed-by: NArnd Bergmann <arnd@arndb.de>
Signed-off-by: NStefan Richter <stefanr@s5r6.in-berlin.de>
上级 100ceb66
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#include <linux/sched.h> /* required for linux/wait.h */ #include <linux/sched.h> /* required for linux/wait.h */
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/time64.h>
#include <linux/timex.h> #include <linux/timex.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <linux/wait.h> #include <linux/wait.h>
...@@ -413,17 +414,18 @@ static void ...@@ -413,17 +414,18 @@ static void
packet_irq_handler(struct pcilynx *lynx) packet_irq_handler(struct pcilynx *lynx)
{ {
struct client *client; struct client *client;
u32 tcode_mask, tcode; u32 tcode_mask, tcode, timestamp;
size_t length; size_t length;
struct timeval tv; struct timespec64 ts64;
/* FIXME: Also report rcv_speed. */ /* FIXME: Also report rcv_speed. */
length = __le32_to_cpu(lynx->rcv_pcl->pcl_status) & 0x00001fff; length = __le32_to_cpu(lynx->rcv_pcl->pcl_status) & 0x00001fff;
tcode = __le32_to_cpu(lynx->rcv_buffer[1]) >> 4 & 0xf; tcode = __le32_to_cpu(lynx->rcv_buffer[1]) >> 4 & 0xf;
do_gettimeofday(&tv); ktime_get_real_ts64(&ts64);
lynx->rcv_buffer[0] = (__force __le32)tv.tv_usec; timestamp = ts64.tv_nsec / NSEC_PER_USEC;
lynx->rcv_buffer[0] = (__force __le32)timestamp;
if (length == PHY_PACKET_SIZE) if (length == PHY_PACKET_SIZE)
tcode_mask = 1 << TCODE_PHY_PACKET; tcode_mask = 1 << TCODE_PHY_PACKET;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册