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

Commit 9de056e9 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drivers: net: qti-can: Use div_u64 for 64-bit division"

parents 94debfa6 dddf7fed

drivers/net/can/spi/qti-can.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <linux/of_gpio.h>

#include <linux/of_gpio.h>

#include <linux/uaccess.h>

#include <linux/uaccess.h>

#include <linux/pm.h>

#include <linux/pm.h>

#include <asm/arch_timer.h>

#include <asm/div64.h>

#include <asm/div64.h>





#define DEBUG_QTI_CAN	0

#define DEBUG_QTI_CAN	0
@@ -449,7 +450,7 @@ static int qti_can_process_response(struct qti_can *priv_data, 
			(struct can_time_info *)resp->data;

			(struct can_time_info *)resp->data;





		if (priv_data->use_qtimer)

		if (priv_data->use_qtimer)

			mstime = (((s64)qtimer_time()) / NSEC_PER_MSEC);

			mstime = div_u64(qtimer_time(), NSEC_PER_MSEC);

		else

		else

			mstime = ktime_to_ms(ktime_get_boottime());

			mstime = ktime_to_ms(ktime_get_boottime());