Merge tag 'md/3.20' of git://neil.brown.name/md

[cascardo/linux.git] / sound / drivers / serial-u16550.c

diff --git a/sound/drivers/serial-u16550.c b/sound/drivers/serial-u16550.c
index 13a34e3..1927b89 100644 (file)
--- a/sound/drivers/serial-u16550.c
+++ b/sound/drivers/serial-u16550.c
@@ -37,6 +37,7 @@
 #include <linux/slab.h>
 #include <linux/ioport.h>
 #include <linux/module.h>
+#include <linux/io.h>
 #include <sound/core.h>
 #include <sound/rawmidi.h>
 #include <sound/initval.h>
@@ -44,8 +45,6 @@
 #include <linux/serial_reg.h>
 #include <linux/jiffies.h>
 
-#include <asm/io.h>
-
 MODULE_DESCRIPTION("MIDI serial u16550");
 MODULE_LICENSE("GPL");
 MODULE_SUPPORTED_DEVICE("{{ALSA, MIDI serial u16550}}");
@@ -174,9 +173,8 @@ static inline void snd_uart16550_add_timer(struct snd_uart16550 *uart)
 {
        if (!uart->timer_running) {
                /* timer 38600bps * 10bit * 16byte */
-               uart->buffer_timer.expires = jiffies + (HZ+255)/256;
+               mod_timer(&uart->buffer_timer, jiffies + (HZ + 255) / 256);
                uart->timer_running = 1;
-               add_timer(&uart->buffer_timer);
        }
 }
 
@@ -830,9 +828,8 @@ static int snd_uart16550_create(struct snd_card *card,
        uart->prev_in = 0;
        uart->rstatus = 0;
        memset(uart->prev_status, 0x80, sizeof(unsigned char) * SNDRV_SERIAL_MAX_OUTS);
-       init_timer(&uart->buffer_timer);
-       uart->buffer_timer.function = snd_uart16550_buffer_timer;
-       uart->buffer_timer.data = (unsigned long)uart;
+       setup_timer(&uart->buffer_timer, snd_uart16550_buffer_timer,
+                   (unsigned long)uart);
        uart->timer_running = 0;
 
        /* Register device */