aboutsummaryrefslogtreecommitdiffstats
path: root/sound/core
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2014-06-11 19:59:14 -0400
committerTakashi Iwai <tiwai@suse.de>2014-06-12 06:58:16 -0400
commit26204e048d2ee0c65e0539f7cc2b66f845a19a41 (patch)
treef7c5fbb2d50665697987739cb2d073a4098afdfb /sound/core
parentb4f75aea553a2146bbdd159c397a2ac42cbb9902 (diff)
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: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core')
-rw-r--r--sound/core/timer.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/core/timer.c b/sound/core/timer.c
index cfd455a8ac1a..777a45e08e53 100644
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
@@ -390,7 +390,7 @@ static void snd_timer_notify1(struct snd_timer_instance *ti, int event)
390 struct timespec tstamp; 390 struct timespec tstamp;
391 391
392 if (timer_tstamp_monotonic) 392 if (timer_tstamp_monotonic)
393 do_posix_clock_monotonic_gettime(&tstamp); 393 ktime_get_ts(&tstamp);
394 else 394 else
395 getnstimeofday(&tstamp); 395 getnstimeofday(&tstamp);
396 if (snd_BUG_ON(event < SNDRV_TIMER_EVENT_START || 396 if (snd_BUG_ON(event < SNDRV_TIMER_EVENT_START ||
@@ -1203,7 +1203,7 @@ static void snd_timer_user_tinterrupt(struct snd_timer_instance *timeri,
1203 } 1203 }
1204 if (tu->last_resolution != resolution || ticks > 0) { 1204 if (tu->last_resolution != resolution || ticks > 0) {
1205 if (timer_tstamp_monotonic) 1205 if (timer_tstamp_monotonic)
1206 do_posix_clock_monotonic_gettime(&tstamp); 1206 ktime_get_ts(&tstamp);
1207 else 1207 else
1208 getnstimeofday(&tstamp); 1208 getnstimeofday(&tstamp);
1209 } 1209 }