1 files changed, 4 insertions, 6 deletions

diff --git a/sound/drivers/dummy.c b/sound/drivers/dummy.c
index 5d0dfb787cec..d11baaf0f0b4 100644
--- a/sound/drivers/dummy.c
+++ b/sound/drivers/dummy.c
@@ -245,9 +245,8 @@ struct dummy_systimer_pcm {
 
 static void dummy_systimer_rearm(struct dummy_systimer_pcm *dpcm)
 {
-        dpcm->timer.expires = jiffies +
-                (dpcm->frac_period_rest + dpcm->rate - 1) / dpcm->rate;
-        add_timer(&dpcm->timer);
+        mod_timer(&dpcm->timer, jiffies +
+                (dpcm->frac_period_rest + dpcm->rate - 1) / dpcm->rate);
 }
 
 static void dummy_systimer_update(struct dummy_systimer_pcm *dpcm)
@@ -340,9 +339,8 @@ static int dummy_systimer_create(struct snd_pcm_substream *substream)
         if (!dpcm)
                 return -ENOMEM;
         substream->runtime->private_data = dpcm;
-        init_timer(&dpcm->timer);
-        dpcm->timer.data = (unsigned long) dpcm;
-        dpcm->timer.function = dummy_systimer_callback;
+        setup_timer(&dpcm->timer, dummy_systimer_callback,
+                        (unsigned long) dpcm);
         spin_lock_init(&dpcm->lock);
         dpcm->substream = substream;
         return 0;