Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61ef4b90 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman
Browse files

USB: mon: use ktime_get_real_ts64 instead of getnstimeofday64 



The two do the same thing, but we want to remove getnstimeofday64()
to have a more consistent interface.

It would be nice to use a monotonic clocksource here rather than
'real' time, but that would break the user interface.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8f9cc83c

drivers/usb/mon/mon_bin.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -95,8 +95,8 @@ struct mon_bin_hdr { 
	unsigned short busnum;	/* Bus number */

	unsigned short busnum;	/* Bus number */

	char flag_setup;

	char flag_setup;

	char flag_data;

	char flag_data;

	s64 ts_sec;		/* getnstimeofday64 */

	s64 ts_sec;		/* ktime_get_real_ts64 */

	s32 ts_usec;		/* getnstimeofday64 */

	s32 ts_usec;		/* ktime_get_real_ts64 */

	int status;

	int status;

	unsigned int len_urb;	/* Length of data (submitted or actual) */

	unsigned int len_urb;	/* Length of data (submitted or actual) */

	unsigned int len_cap;	/* Delivered length */

	unsigned int len_cap;	/* Delivered length */
@@ -497,7 +497,7 @@ static void mon_bin_event(struct mon_reader_bin *rp, struct urb *urb, 
	struct mon_bin_hdr *ep;

	struct mon_bin_hdr *ep;

	char data_tag = 0;

	char data_tag = 0;





	getnstimeofday64(&ts);

	ktime_get_real_ts64(&ts);





	spin_lock_irqsave(&rp->b_lock, flags);

	spin_lock_irqsave(&rp->b_lock, flags);
@@ -637,7 +637,7 @@ static void mon_bin_error(void *data, struct urb *urb, int error) 
	unsigned int offset;

	unsigned int offset;

	struct mon_bin_hdr *ep;

	struct mon_bin_hdr *ep;





	getnstimeofday64(&ts);

	ktime_get_real_ts64(&ts);





	spin_lock_irqsave(&rp->b_lock, flags);

	spin_lock_irqsave(&rp->b_lock, flags);