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

Commit 26204e04 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Takashi Iwai
Browse files

ALSA: core: Use ktime_get_ts() 



do_posix_clock_monotonic_gettime() is a leftover from the initial
posix timer implementation which maps to ktime_get_ts().

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent b4f75aea

include/sound/pcm.h

+1 −1
Original line number Diff line number Diff line
@@ -932,7 +932,7 @@ static inline void snd_pcm_gettime(struct snd_pcm_runtime *runtime, 
				   struct timespec *tv)

{

	if (runtime->tstamp_type == SNDRV_PCM_TSTAMP_TYPE_MONOTONIC)

		do_posix_clock_monotonic_gettime(tv);

		ktime_get_ts(tv);

	else

		getnstimeofday(tv);

}

sound/core/timer.c

+2 −2
Original line number Diff line number Diff line
@@ -390,7 +390,7 @@ static void snd_timer_notify1(struct snd_timer_instance *ti, int event) 
	struct timespec tstamp;



	if (timer_tstamp_monotonic)

		do_posix_clock_monotonic_gettime(&tstamp);

		ktime_get_ts(&tstamp);

	else

		getnstimeofday(&tstamp);

	if (snd_BUG_ON(event < SNDRV_TIMER_EVENT_START ||
@@ -1203,7 +1203,7 @@ static void snd_timer_user_tinterrupt(struct snd_timer_instance *timeri, 
	}

	if (tu->last_resolution != resolution || ticks > 0) {

		if (timer_tstamp_monotonic)

			do_posix_clock_monotonic_gettime(&tstamp);

			ktime_get_ts(&tstamp);

		else

			getnstimeofday(&tstamp);

	}