iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ALSA: mtpav: 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:36 +01:00
parent b093ed23da
commit 2b1b781143
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sound/drivers/mtpav.c
View File

@@ -414,8 +414,7 @@ static void snd_mtpav_output_timer(unsigned long data)
spin_lock_irqsave(&chip->spinlock, flags); spin_lock_irqsave(&chip->spinlock, flags);
/* reprogram timer */ /* reprogram timer */
chip->timer.expires = 1 + jiffies; mod_timer(&chip->timer, 1 + jiffies);
add_timer(&chip->timer);
/* process each port */ /* process each port */
for (p = 0; p <= chip->num_ports * 2 + MTPAV_PIDX_BROADCAST; p++) { for (p = 0; p <= chip->num_ports * 2 + MTPAV_PIDX_BROADCAST; p++) {
struct mtpav_port *portp = &chip->ports[p]; struct mtpav_port *portp = &chip->ports[p];
@@ -428,8 +427,7 @@ static void snd_mtpav_output_timer(unsigned long data)
/* spinlock held! */ /* spinlock held! */
static void snd_mtpav_add_output_timer(struct mtpav *chip) static void snd_mtpav_add_output_timer(struct mtpav *chip)
{ {
chip->timer.expires = 1 + jiffies; mod_timer(&chip->timer, 1 + jiffies);
add_timer(&chip->timer);
} }
/* spinlock held! */ /* spinlock held! */
@@ -704,15 +702,13 @@ static int snd_mtpav_probe(struct platform_device *dev)
mtp_card = card->private_data; mtp_card = card->private_data;
spin_lock_init(&mtp_card->spinlock); spin_lock_init(&mtp_card->spinlock);
init_timer(&mtp_card->timer);
mtp_card->card = card; mtp_card->card = card;
mtp_card->irq = -1; mtp_card->irq = -1;
mtp_card->share_irq = 0; mtp_card->share_irq = 0;
mtp_card->inmidistate = 0; mtp_card->inmidistate = 0;
mtp_card->outmidihwport = 0xffffffff; mtp_card->outmidihwport = 0xffffffff;
init_timer(&mtp_card->timer); setup_timer(&mtp_card->timer, snd_mtpav_output_timer,
mtp_card->timer.function = snd_mtpav_output_timer; (unsigned long) mtp_card);
mtp_card->timer.data = (unsigned long) mtp_card;
card->private_free = snd_mtpav_free; card->private_free = snd_mtpav_free;