aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2015-01-19 05:29:09 -0500
committerTakashi Iwai <tiwai@suse.de>2015-01-19 05:32:26 -0500
commitd80d05fcca1771ff68e0b385459fabb3eb938e98 (patch)
treebfadffdf9e91bc70f2d5632bf3078db9f969b007
parentf5d5f75fe167c8b80747290968aeaa91457cb10a (diff)
ALSA: serial-u16550: Use setup_timer() and mod_timer()
No functional change, refactoring with the standard helpers. Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/drivers/serial-u16550.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/sound/drivers/serial-u16550.c b/sound/drivers/serial-u16550.c
index 13a34e3c6382..8c1dc73e14e4 100644
--- a/sound/drivers/serial-u16550.c
+++ b/sound/drivers/serial-u16550.c
@@ -174,9 +174,8 @@ static inline void snd_uart16550_add_timer(struct snd_uart16550 *uart)
174{ 174{
175 if (!uart->timer_running) { 175 if (!uart->timer_running) {
176 /* timer 38600bps * 10bit * 16byte */ 176 /* timer 38600bps * 10bit * 16byte */
177 uart->buffer_timer.expires = jiffies + (HZ+255)/256; 177 mod_timer(&uart->buffer_timer, jiffies + (HZ + 255) / 256);
178 uart->timer_running = 1; 178 uart->timer_running = 1;
179 add_timer(&uart->buffer_timer);
180 } 179 }
181} 180}
182 181
@@ -830,9 +829,8 @@ static int snd_uart16550_create(struct snd_card *card,
830 uart->prev_in = 0; 829 uart->prev_in = 0;
831 uart->rstatus = 0; 830 uart->rstatus = 0;
832 memset(uart->prev_status, 0x80, sizeof(unsigned char) * SNDRV_SERIAL_MAX_OUTS); 831 memset(uart->prev_status, 0x80, sizeof(unsigned char) * SNDRV_SERIAL_MAX_OUTS);
833 init_timer(&uart->buffer_timer); 832 setup_timer(&uart->buffer_timer, snd_uart16550_buffer_timer,
834 uart->buffer_timer.function = snd_uart16550_buffer_timer; 833 (unsigned long)uart);
835 uart->buffer_timer.data = (unsigned long)uart;
836 uart->timer_running = 0; 834 uart->timer_running = 0;
837 835
838 /* Register device */ 836 /* Register device */