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

Commit 9f61e309 authored by Chunyan Zhang's avatar Chunyan Zhang Committed by David S. Miller
Browse files

irda: ali-ircc: Replace timeval with ktime_t 



The ali ircc driver uses 'timeval', which we try to remove in the kernel
because all 32-bit time types will break in the year 2038.

This patch also changes do_gettimeofday() to ktime_get() accordingly,
since ktime_get returns a ktime_t, but do_gettimeofday returns a
struct timeval, and the other reason is that ktime_get() uses
the monotonic clock.

This patch uses ktime_us_delta to get the elapsed time, and in this
way it no longer needs to check for the overflow, because
ktime_us_delta returns time difference of microsecond.

Signed-off-by: default avatarChunyan Zhang <zhang.chunyan@linaro.org>
Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 270d73c1

drivers/net/irda/ali-ircc.c

+3 −8
Original line number Diff line number Diff line
@@ -1462,17 +1462,12 @@ static netdev_tx_t ali_ircc_fir_hard_xmit(struct sk_buff *skb, 
		if (mtt) 

		{

			/* Check how much time we have used already */

			do_gettimeofday(&self->now);

			

			diff = self->now.tv_usec - self->stamp.tv_usec;

			diff = ktime_us_delta(ktime_get(), self->stamp);

			/* self->stamp is set from ali_ircc_dma_receive_complete() */

							

			pr_debug("%s(), ******* diff = %d *******\n",

				 __func__, diff);



			if (diff < 0) 

				diff += 1000000;

			

			/* Check if the mtt is larger than the time we have

			 * already used by all the protocol processing

			 */
@@ -1884,7 +1879,7 @@ static int ali_ircc_dma_receive_complete(struct ali_ircc_cb *self) 
			 * reduce the min turn time a bit since we will know

			 * how much time we have used for protocol processing

			 */

			do_gettimeofday(&self->stamp);

			self->stamp = ktime_get();



			skb = dev_alloc_skb(len+1);

			if (skb == NULL)

drivers/net/irda/ali-ircc.h

+2 −3
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
#ifndef ALI_IRCC_H

#define ALI_IRCC_H



#include <linux/time.h>

#include <linux/ktime.h>



#include <linux/spinlock.h>

#include <linux/pm.h>
@@ -209,8 +209,7 @@ struct ali_ircc_cb { 
	

	unsigned char rcvFramesOverflow;

		

	struct timeval stamp;

	struct timeval now;

	ktime_t stamp;



	spinlock_t lock;           /* For serializing operations */