3 files changed, 8 insertions, 14 deletions

diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c
index dfc5f45f2748..3dbf9bf2ac16 100644
--- a/sound/core/pcm_lib.c
+++ b/sound/core/pcm_lib.c
@@ -152,7 +152,7 @@ static inline snd_pcm_uframes_t snd_pcm_update_hw_ptr_pos(snd_pcm_substream_t *s
         if (pos == SNDRV_PCM_POS_XRUN)
                 return pos; /* XRUN */
         if (runtime->tstamp_mode & SNDRV_PCM_TSTAMP_MMAP)
-                snd_timestamp_now((snd_timestamp_t*)&runtime->status->tstamp, runtime->tstamp_timespec);
+                getnstimeofday((struct timespec *)&runtime->status->tstamp);
 #ifdef CONFIG_SND_DEBUG
         if (pos >= runtime->buffer_size) {
                 snd_printk(KERN_ERR  "BUG: stream = %i, pos = 0x%lx, buffer size = 0x%lx, period size = 0x%lx\n", substream->stream, pos, runtime->buffer_size, runtime->period_size);
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index e6e2b70314c0..a1924f12d8fc 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -565,9 +565,9 @@ int snd_pcm_status(snd_pcm_substream_t *substream,
                 if (runtime->tstamp_mode & SNDRV_PCM_TSTAMP_MMAP)
                         status->tstamp = runtime->status->tstamp;
                 else
-                        snd_timestamp_now(&status->tstamp, runtime->tstamp_timespec);
+                        getnstimeofday(&status->tstamp);
         } else
-                snd_timestamp_now(&status->tstamp, runtime->tstamp_timespec);
+                getnstimeofday(&status->tstamp);
         status->appl_ptr = runtime->control->appl_ptr;
         status->hw_ptr = runtime->status->hw_ptr;
         if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
@@ -652,7 +652,7 @@ static void snd_pcm_trigger_tstamp(snd_pcm_substream_t *substream)
         if (runtime->trigger_master == NULL)
                 return;
         if (runtime->trigger_master == substream) {
-                snd_timestamp_now(&runtime->trigger_tstamp, runtime->tstamp_timespec);
+                getnstimeofday(&runtime->trigger_tstamp);
         } else {
                 snd_pcm_trigger_tstamp(runtime->trigger_master);
                 runtime->trigger_tstamp = runtime->trigger_master->runtime->trigger_tstamp;
@@ -2446,14 +2446,8 @@ static int snd_pcm_common_ioctl1(snd_pcm_substream_t *substream,
                 return put_user(SNDRV_PCM_VERSION, (int __user *)arg) ? -EFAULT : 0;
         case SNDRV_PCM_IOCTL_INFO:
                 return snd_pcm_info_user(substream, arg);
-        case SNDRV_PCM_IOCTL_TSTAMP:
-        {
-                int xarg;
-                if (get_user(xarg, (int __user *)arg))
-                        return -EFAULT;
-                substream->runtime->tstamp_timespec = xarg ? 1 : 0;
+        case SNDRV_PCM_IOCTL_TSTAMP: /* just for compatibility */
                 return 0;
-        }
         case SNDRV_PCM_IOCTL_HW_REFINE:
                 return snd_pcm_hw_refine_user(substream, arg);
         case SNDRV_PCM_IOCTL_HW_PARAMS:
diff --git a/sound/core/timer.c b/sound/core/timer.c
index 128916c66085..8ecec9134acd 100644
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
@@ -385,7 +385,7 @@ static void snd_timer_notify1(snd_timer_instance_t *ti, enum sndrv_timer_event e
         struct list_head *n;
         struct timespec tstamp;
 
-        snd_timestamp_now(&tstamp, 1);
+        getnstimeofday(&tstamp);
         snd_assert(event >= SNDRV_TIMER_EVENT_START && event <= SNDRV_TIMER_EVENT_PAUSE, return);
         if (event == SNDRV_TIMER_EVENT_START || event == SNDRV_TIMER_EVENT_CONTINUE)
                 resolution = snd_timer_resolution(ti);
@@ -1156,14 +1156,14 @@ static void snd_timer_user_tinterrupt(snd_timer_instance_t *timeri,
         struct timespec tstamp;
         int prev, append = 0;
 
-        snd_timestamp_zero(&tstamp);
+        memset(&tstamp, 0, sizeof(tstamp));
         spin_lock(&tu->qlock);
         if ((tu->filter & ((1 << SNDRV_TIMER_EVENT_RESOLUTION)|(1 << SNDRV_TIMER_EVENT_TICK))) == 0) {
                 spin_unlock(&tu->qlock);
                 return;
         }
         if (tu->last_resolution != resolution || ticks > 0)
-                snd_timestamp_now(&tstamp, 1);
+                getnstimeofday(&tstamp);
         if ((tu->filter & (1 << SNDRV_TIMER_EVENT_RESOLUTION)) && tu->last_resolution != resolution) {
                 r1.event = SNDRV_TIMER_EVENT_RESOLUTION;
                 r1.tstamp = tstamp;