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

Commit 326f0480 authored by Aya Mahfouz's avatar Aya Mahfouz Committed by Takashi Iwai
Browse files

ALSA: pcxhr: convert timeval to ktime_t 



This patch is concerned with migrating the time variables in the pcxhr
module found in the sound driver. The changes are concerend with the
y2038 problem where timeval will overflow in the year 2038. ktime_t
was used instead of timeval to get the wall time. The difference
is displayed now in nanoseconds instead of microseconds.

Signed-off-by: default avatarAya Mahfouz <mahfouz.saif.elyazal@gmail.com>
Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 66797f36

sound/pci/pcxhr/pcxhr.c

+6 −4
Original line number Diff line number Diff line
@@ -711,8 +711,9 @@ static void pcxhr_start_linked_stream(struct pcxhr_mgr *mgr) 
	int playback_mask = 0;



#ifdef CONFIG_SND_DEBUG_VERBOSE

	struct timeval my_tv1, my_tv2;

	do_gettimeofday(&my_tv1);

	ktime_t start_time, stop_time, diff_time;



	start_time = ktime_get();

#endif

	mutex_lock(&mgr->setup_mutex);
@@ -823,9 +824,10 @@ static void pcxhr_start_linked_stream(struct pcxhr_mgr *mgr) 
	mutex_unlock(&mgr->setup_mutex);



#ifdef CONFIG_SND_DEBUG_VERBOSE

	do_gettimeofday(&my_tv2);

	stop_time = ktime_get();

	diff_time = ktime_sub(stop_time, start_time);

	dev_dbg(&mgr->pci->dev, "***TRIGGER START*** TIME = %ld (err = %x)\n",

		    (long)(my_tv2.tv_usec - my_tv1.tv_usec), err);

		    (long)(ktime_to_ns(diff_time)), err);

#endif

}

sound/pci/pcxhr/pcxhr_core.c

+6 −4
Original line number Diff line number Diff line
@@ -910,8 +910,9 @@ int pcxhr_set_pipe_state(struct pcxhr_mgr *mgr, int playback_mask, 
	int audio_mask;



#ifdef CONFIG_SND_DEBUG_VERBOSE

	struct timeval my_tv1, my_tv2;

	do_gettimeofday(&my_tv1);

	ktime_t start_time, stop_time, diff_time;



	start_time = ktime_get();

#endif

	audio_mask = (playback_mask |

		      (capture_mask << PCXHR_PIPE_STATE_CAPTURE_OFFSET));
@@ -960,9 +961,10 @@ int pcxhr_set_pipe_state(struct pcxhr_mgr *mgr, int playback_mask, 
			return err;

	}

#ifdef CONFIG_SND_DEBUG_VERBOSE

	do_gettimeofday(&my_tv2);

	stop_time = ktime_get();

	diff_time = ktime_sub(stop_time, start_time);

	dev_dbg(&mgr->pci->dev, "***SET PIPE STATE*** TIME = %ld (err = %x)\n",

		    (long)(my_tv2.tv_usec - my_tv1.tv_usec), err);

			(long)(ktime_to_ns(diff_time)), err);

#endif

	return 0;

}