1 files changed, 7 insertions, 13 deletions

diff --git a/sound/pci/rme9652/hdsp.c b/sound/pci/rme9652/hdsp.c
index cf5a6c8b9a63..c19e021ccf66 100644
--- a/sound/pci/rme9652/hdsp.c
+++ b/sound/pci/rme9652/hdsp.c
@@ -29,6 +29,7 @@
 #include <linux/module.h>
 #include <linux/math64.h>
 #include <linux/vmalloc.h>
+#include <linux/io.h>
 
 #include <sound/core.h>
 #include <sound/control.h>
@@ -42,7 +43,6 @@
 
 #include <asm/byteorder.h>
 #include <asm/current.h>
-#include <asm/io.h>
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;      /* Index 0-MAX */
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;       /* ID for this card */
@@ -1428,10 +1428,8 @@ static void snd_hdsp_midi_output_timer(unsigned long data)
            leaving istimer wherever it was set before.
         */
 
-        if (hmidi->istimer) {
-                hmidi->timer.expires = 1 + jiffies;
-                add_timer(&hmidi->timer);
-        }
+        if (hmidi->istimer)
+                mod_timer(&hmidi->timer, 1 + jiffies);
 
         spin_unlock_irqrestore (&hmidi->lock, flags);
 }
@@ -1445,11 +1443,9 @@ static void snd_hdsp_midi_output_trigger(struct snd_rawmidi_substream *substream
         spin_lock_irqsave (&hmidi->lock, flags);
         if (up) {
                 if (!hmidi->istimer) {
-                        init_timer(&hmidi->timer);
-                        hmidi->timer.function = snd_hdsp_midi_output_timer;
-                        hmidi->timer.data = (unsigned long) hmidi;
-                        hmidi->timer.expires = 1 + jiffies;
-                        add_timer(&hmidi->timer);
+                        setup_timer(&hmidi->timer, snd_hdsp_midi_output_timer,
+                                    (unsigned long) hmidi);
+                        mod_timer(&hmidi->timer, 1 + jiffies);
                         hmidi->istimer++;
                 }
         } else {
@@ -5309,9 +5305,7 @@ static int snd_hdsp_free(struct hdsp *hdsp)
 
         release_firmware(hdsp->firmware);
         vfree(hdsp->fw_uploaded);
-
-        if (hdsp->iobase)
-                iounmap(hdsp->iobase);
+        iounmap(hdsp->iobase);
 
         if (hdsp->port)
                 pci_release_regions(hdsp->pci);