Skip to content

Commit

Permalink
ALSA: core: Use ktime_get_ts()
Browse files Browse the repository at this point in the history
do_posix_clock_monotonic_gettime() is a leftover from the initial
posix timer implementation which maps to ktime_get_ts().

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
Thomas Gleixner authored and Takashi Iwai committed Jun 12, 2014
1 parent b4f75ae commit 26204e0
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion include/sound/pcm.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
4 changes: 2 additions & 2 deletions sound/core/timer.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 ||
Expand Down Expand Up @@ -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);
}
Expand Down

0 comments on commit 26204e0

Please sign in to comment.