1 files changed, 7 insertions, 15 deletions

diff --git a/sound/pci/asihpi/asihpi.c b/sound/pci/asihpi/asihpi.c
index e9273fb2a505..e5cd7be85355 100644
--- a/sound/pci/asihpi/asihpi.c
+++ b/sound/pci/asihpi/asihpi.c
@@ -540,9 +540,8 @@ static void snd_card_asihpi_pcm_timer_start(struct snd_pcm_substream *
         expiry = HZ / 200;
 
         expiry = max(expiry, 1); /* don't let it be zero! */
-        dpcm->timer.expires = jiffies + expiry;
+        mod_timer(&dpcm->timer, jiffies + expiry);
         dpcm->respawn_timer = 1;
-        add_timer(&dpcm->timer);
 }
 
 static void snd_card_asihpi_pcm_timer_stop(struct snd_pcm_substream *substream)
@@ -1064,9 +1063,8 @@ static int snd_card_asihpi_playback_open(struct snd_pcm_substream *substream)
             If internal and other stream playing, can't switch
         */
 
-        init_timer(&dpcm->timer);
-        dpcm->timer.data = (unsigned long) dpcm;
-        dpcm->timer.function = snd_card_asihpi_timer_function;
+        setup_timer(&dpcm->timer, snd_card_asihpi_timer_function,
+                    (unsigned long) dpcm);
         dpcm->substream = substream;
         runtime->private_data = dpcm;
         runtime->private_free = snd_card_asihpi_runtime_free;
@@ -1246,9 +1244,8 @@ static int snd_card_asihpi_capture_open(struct snd_pcm_substream *substream)
         if (err)
                 return -EIO;
 
-        init_timer(&dpcm->timer);
-        dpcm->timer.data = (unsigned long) dpcm;
-        dpcm->timer.function = snd_card_asihpi_timer_function;
+        setup_timer(&dpcm->timer, snd_card_asihpi_timer_function,
+                    (unsigned long) dpcm);
         dpcm->substream = substream;
         runtime->private_data = dpcm;
         runtime->private_free = snd_card_asihpi_runtime_free;
@@ -2832,14 +2829,11 @@ static int snd_asihpi_hpi_ioctl(struct snd_hwdep *hw, struct file *file,
 /* results in /dev/snd/hwC#D0 file for each card with index #
    also /proc/asound/hwdep will contain '#-00: asihpi (HPI) for each card'
 */
-static int snd_asihpi_hpi_new(struct snd_card_asihpi *asihpi,
-                              int device, struct snd_hwdep **rhwdep)
+static int snd_asihpi_hpi_new(struct snd_card_asihpi *asihpi, int device)
 {
         struct snd_hwdep *hw;
         int err;
 
-        if (rhwdep)
-                *rhwdep = NULL;
         err = snd_hwdep_new(asihpi->card, "HPI", device, &hw);
         if (err < 0)
                 return err;
@@ -2849,8 +2843,6 @@ static int snd_asihpi_hpi_new(struct snd_card_asihpi *asihpi,
         hw->ops.ioctl = snd_asihpi_hpi_ioctl;
         hw->ops.release = snd_asihpi_hpi_release;
         hw->private_data = asihpi;
-        if (rhwdep)
-                *rhwdep = hw;
         return 0;
 }
 
@@ -2993,7 +2985,7 @@ static int snd_asihpi_probe(struct pci_dev *pci_dev,
 
         /* always create, can be enabled or disabled dynamically
             by enable_hwdep  module param*/
-        snd_asihpi_hpi_new(asihpi, 0, NULL);
+        snd_asihpi_hpi_new(asihpi, 0);
 
         strcpy(card->driver, "ASIHPI");