Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ALSA: korg1212: 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:34:18 +01:00
parent 8a3e7dfc90
commit 3d6f0e0cb3
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/pci/korg1212/korg1212.c
View file

@ -585,8 +585,7 @@ static void snd_korg1212_SendStop(struct snd_korg1212 *korg1212)
korg1212->sharedBufferPtr->cardCommand = 0xffffffff; korg1212->sharedBufferPtr->cardCommand = 0xffffffff;
/* program the timer */ /* program the timer */
korg1212->stop_pending_cnt = HZ; korg1212->stop_pending_cnt = HZ;
korg1212->timer.expires = jiffies + 1; mod_timer(&korg1212->timer, jiffies + 1);
add_timer(&korg1212->timer);
} }
} }
@ -617,8 +616,7 @@ static void snd_korg1212_timer_func(unsigned long data)
} else { } else {
if (--korg1212->stop_pending_cnt > 0) { if (--korg1212->stop_pending_cnt > 0) {
/* reprogram timer */ /* reprogram timer */
korg1212->timer.expires = jiffies + 1; mod_timer(&korg1212->timer, jiffies + 1);
add_timer(&korg1212->timer);
} else { } else {
snd_printd("korg1212_timer_func timeout\n"); snd_printd("korg1212_timer_func timeout\n");
korg1212->sharedBufferPtr->cardCommand = 0; korg1212->sharedBufferPtr->cardCommand = 0;
@ -2172,9 +2170,8 @@ static int snd_korg1212_create(struct snd_card *card, struct pci_dev *pci,
init_waitqueue_head(&korg1212->wait); init_waitqueue_head(&korg1212->wait);
spin_lock_init(&korg1212->lock); spin_lock_init(&korg1212->lock);
mutex_init(&korg1212->open_mutex); mutex_init(&korg1212->open_mutex);
init_timer(&korg1212->timer); setup_timer(&korg1212->timer, snd_korg1212_timer_func,
korg1212->timer.function = snd_korg1212_timer_func; (unsigned long)korg1212);
korg1212->timer.data = (unsigned long)korg1212;
korg1212->irq = -1; korg1212->irq = -1;
korg1212->clkSource = K1212_CLKIDX_Local; korg1212->clkSource = K1212_CLKIDX_Local;