redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

Staging: rts5208: Replace timeval with timespec64

Browse source 
struct timeval tv is used to get current time.
32-bit systems using 'struct timeval' will break in the year 2038, so
we have to replace that code with more appropriate types.

Signed-off-by: Ksenija Stanojevic <ksenija.stanojevic@gmail.com>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ksenija Stanojevic 2015-04-30 19:00:23 +02:00 committed by Greg Kroah-Hartman
parent ac04b3b73b
commit d5a7d45fb5
1 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
drivers/staging/rts5208/rtsx.h
View file

@ -37,7 +37,7 @@
#include <linux/cdrom.h> #include <linux/cdrom.h>
#include <linux/workqueue.h> #include <linux/workqueue.h>
#include <linux/timer.h> #include <linux/timer.h>
#include <linux/time.h> #include <linux/time64.h>
#include <scsi/scsi.h> #include <scsi/scsi.h>
#include <scsi/scsi_cmnd.h> #include <scsi/scsi_cmnd.h>
@ -148,21 +148,24 @@ static inline struct rtsx_dev *host_to_rtsx(struct Scsi_Host *host)
static inline void get_current_time(u8 *timeval_buf, int buf_len) static inline void get_current_time(u8 *timeval_buf, int buf_len)
{ {
struct timeval tv; struct timespec64 ts64;
u32 tv_usec;
if (!timeval_buf || (buf_len < 8)) if (!timeval_buf || (buf_len < 8))
return; return;
do_gettimeofday(&tv); getnstimeofday64(&ts64);
timeval_buf[0] = (u8)(tv.tv_sec >> 24); tv_usec = ts64.tv_nsec/NSEC_PER_USEC;
timeval_buf[1] = (u8)(tv.tv_sec >> 16);
timeval_buf[2] = (u8)(tv.tv_sec >> 8); timeval_buf[0] = (u8)(ts64.tv_sec >> 24);
timeval_buf[3] = (u8)(tv.tv_sec); timeval_buf[1] = (u8)(ts64.tv_sec >> 16);
timeval_buf[4] = (u8)(tv.tv_usec >> 24); timeval_buf[2] = (u8)(ts64.tv_sec >> 8);
timeval_buf[5] = (u8)(tv.tv_usec >> 16); timeval_buf[3] = (u8)(ts64.tv_sec);
timeval_buf[6] = (u8)(tv.tv_usec >> 8); timeval_buf[4] = (u8)(tv_usec >> 24);
timeval_buf[7] = (u8)(tv.tv_usec); timeval_buf[5] = (u8)(tv_usec >> 16);
timeval_buf[6] = (u8)(tv_usec >> 8);
timeval_buf[7] = (u8)(tv_usec);
} }
/* The scsi_lock() and scsi_unlock() macros protect the sm_state and the /* The scsi_lock() and scsi_unlock() macros protect the sm_state and the