Commit d5a7d45f authored by Ksenija Stanojevic's avatar Ksenija Stanojevic Committed by Greg Kroah-Hartman
Browse files

Staging: rts5208: Replace timeval with timespec64 



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: default avatarKsenija Stanojevic <ksenija.stanojevic@gmail.com>
Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ac04b3b7

drivers/staging/rts5208/rtsx.h

+14 −11
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
#include <linux/cdrom.h>

#include <linux/workqueue.h>

#include <linux/timer.h>

#include <linux/time.h>

#include <linux/time64.h>



#include <scsi/scsi.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)

{

	struct timeval tv;

	struct timespec64 ts64;

	u32 tv_usec;



	if (!timeval_buf || (buf_len < 8))

		return;



	do_gettimeofday(&tv);

	getnstimeofday64(&ts64);



	timeval_buf[0] = (u8)(tv.tv_sec >> 24);

	timeval_buf[1] = (u8)(tv.tv_sec >> 16);

	timeval_buf[2] = (u8)(tv.tv_sec >> 8);

	timeval_buf[3] = (u8)(tv.tv_sec);

	timeval_buf[4] = (u8)(tv.tv_usec >> 24);

	timeval_buf[5] = (u8)(tv.tv_usec >> 16);

	timeval_buf[6] = (u8)(tv.tv_usec >> 8);

	timeval_buf[7] = (u8)(tv.tv_usec);

	tv_usec = ts64.tv_nsec/NSEC_PER_USEC;



	timeval_buf[0] = (u8)(ts64.tv_sec >> 24);

	timeval_buf[1] = (u8)(ts64.tv_sec >> 16);

	timeval_buf[2] = (u8)(ts64.tv_sec >> 8);

	timeval_buf[3] = (u8)(ts64.tv_sec);

	timeval_buf[4] = (u8)(tv_usec >> 24);

	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