mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-02 15:18:19 +00:00
Code Issues Releases Wiki Activity

ALSA: mpu401: Use setup_timer() and mod_timer()

Browse source 
No functional change, refactoring with the standard helpers.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2015-01-19 11:28:13 +01:00
parent db974553e3
commit b093ed23da
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
sound/drivers/mpu401/mpu401_uart.c
View file

@ -176,8 +176,7 @@ static void snd_mpu401_uart_timer(unsigned long data)
spin_lock_irqsave(&mpu->timer_lock, flags); spin_lock_irqsave(&mpu->timer_lock, flags);
/*mpu->mode |= MPU401_MODE_TIMER;*/ /*mpu->mode |= MPU401_MODE_TIMER;*/
mpu->timer.expires = 1 + jiffies; mod_timer(&mpu->timer, 1 + jiffies);
add_timer(&mpu->timer);
spin_unlock_irqrestore(&mpu->timer_lock, flags); spin_unlock_irqrestore(&mpu->timer_lock, flags);
if (mpu->rmidi) if (mpu->rmidi)
_snd_mpu401_uart_interrupt(mpu); _snd_mpu401_uart_interrupt(mpu);
@ -192,11 +191,9 @@ static void snd_mpu401_uart_add_timer (struct snd_mpu401 *mpu, int input)
spin_lock_irqsave (&mpu->timer_lock, flags); spin_lock_irqsave (&mpu->timer_lock, flags);
if (mpu->timer_invoked == 0) { if (mpu->timer_invoked == 0) {
init_timer(&mpu->timer); setup_timer(&mpu->timer, snd_mpu401_uart_timer,
mpu->timer.data = (unsigned long)mpu; (unsigned long)mpu);
mpu->timer.function = snd_mpu401_uart_timer; mod_timer(&mpu->timer, 1 + jiffies);
mpu->timer.expires = 1 + jiffies;
add_timer(&mpu->timer);
} }
mpu->timer_invoked |= input ? MPU401_MODE_INPUT_TIMER : mpu->timer_invoked |= input ? MPU401_MODE_INPUT_TIMER :
MPU401_MODE_OUTPUT_TIMER; MPU401_MODE_OUTPUT_TIMER;