Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3b15d0d5 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/timer-cleanup' into for-next

parents 86b5f3ec 28e237a9

sound/core/timer.c

+1 −3
Original line number Diff line number Diff line
@@ -1030,9 +1030,7 @@ static int snd_timer_register_system(void) 
		snd_timer_free(timer);

		return -ENOMEM;

	}

	init_timer(&priv->tlist);

	priv->tlist.function = snd_timer_s_function;

	priv->tlist.data = (unsigned long) timer;

	setup_timer(&priv->tlist, snd_timer_s_function, (unsigned long) timer);

	timer->private_data = priv;

	timer->private_free = snd_timer_free_system;

	return snd_timer_global_register(timer);

sound/drivers/aloop.c

+1 −2
Original line number Diff line number Diff line
@@ -181,8 +181,7 @@ static void loopback_timer_start(struct loopback_pcm *dpcm) 
	}

	tick = dpcm->period_size_frac - dpcm->irq_pos;

	tick = (tick + dpcm->pcm_bps - 1) / dpcm->pcm_bps;

	dpcm->timer.expires = jiffies + tick;

	add_timer(&dpcm->timer);

	mod_timer(&dpcm->timer, jiffies + tick);

}



/* call in cable->lock */

sound/drivers/mpu401/mpu401_uart.c

+4 −7
Original line number Diff line number Diff line
@@ -176,8 +176,7 @@ static void snd_mpu401_uart_timer(unsigned long data) 


	spin_lock_irqsave(&mpu->timer_lock, flags);

	/*mpu->mode |= MPU401_MODE_TIMER;*/

	mpu->timer.expires = 1 + jiffies;

	add_timer(&mpu->timer);

	mod_timer(&mpu->timer,  1 + jiffies);

	spin_unlock_irqrestore(&mpu->timer_lock, flags);

	if (mpu->rmidi)

		_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);

	if (mpu->timer_invoked == 0) {

		init_timer(&mpu->timer);

		mpu->timer.data = (unsigned long)mpu;

		mpu->timer.function = snd_mpu401_uart_timer;

		mpu->timer.expires = 1 + jiffies;

		add_timer(&mpu->timer);

		setup_timer(&mpu->timer, snd_mpu401_uart_timer,

			    (unsigned long)mpu);

		mod_timer(&mpu->timer, 1 + jiffies);

	} 

	mpu->timer_invoked |= input ? MPU401_MODE_INPUT_TIMER :

		MPU401_MODE_OUTPUT_TIMER;

sound/drivers/mtpav.c

+4 −8
Original line number Diff line number Diff line
@@ -414,8 +414,7 @@ static void snd_mtpav_output_timer(unsigned long data) 


	spin_lock_irqsave(&chip->spinlock, flags);

	/* reprogram timer */

	chip->timer.expires = 1 + jiffies;

	add_timer(&chip->timer);

	mod_timer(&chip->timer, 1 + jiffies);

	/* process each port */

	for (p = 0; p <= chip->num_ports * 2 + MTPAV_PIDX_BROADCAST; p++) {

		struct mtpav_port *portp = &chip->ports[p];
@@ -428,8 +427,7 @@ static void snd_mtpav_output_timer(unsigned long data) 
/* spinlock held! */

static void snd_mtpav_add_output_timer(struct mtpav *chip)

{

	chip->timer.expires = 1 + jiffies;

	add_timer(&chip->timer);

	mod_timer(&chip->timer, 1 + jiffies);

}



/* spinlock held! */
@@ -704,15 +702,13 @@ static int snd_mtpav_probe(struct platform_device *dev) 


	mtp_card = card->private_data;

	spin_lock_init(&mtp_card->spinlock);

	init_timer(&mtp_card->timer);

	mtp_card->card = card;

	mtp_card->irq = -1;

	mtp_card->share_irq = 0;

	mtp_card->inmidistate = 0;

	mtp_card->outmidihwport = 0xffffffff;

	init_timer(&mtp_card->timer);

	mtp_card->timer.function = snd_mtpav_output_timer;

	mtp_card->timer.data = (unsigned long) mtp_card;

	setup_timer(&mtp_card->timer, snd_mtpav_output_timer,

		    (unsigned long) mtp_card);



	card->private_free = snd_mtpav_free;

sound/drivers/opl3/opl3_midi.c

+4 −7
Original line number Diff line number Diff line
@@ -258,12 +258,10 @@ void snd_opl3_timer_func(unsigned long data) 
	spin_unlock_irqrestore(&opl3->voice_lock, flags);



	spin_lock_irqsave(&opl3->sys_timer_lock, flags);

	if (again) {

		opl3->tlist.expires = jiffies + 1;	/* invoke again */

		add_timer(&opl3->tlist);

	} else {

	if (again)

		mod_timer(&opl3->tlist, jiffies + 1);	/* invoke again */

	else

		opl3->sys_timer_status = 0;

	}

	spin_unlock_irqrestore(&opl3->sys_timer_lock, flags);

}
@@ -275,8 +273,7 @@ static void snd_opl3_start_timer(struct snd_opl3 *opl3) 
	unsigned long flags;

	spin_lock_irqsave(&opl3->sys_timer_lock, flags);

	if (! opl3->sys_timer_status) {

		opl3->tlist.expires = jiffies + 1;

		add_timer(&opl3->tlist);

		mod_timer(&opl3->tlist, jiffies + 1);

		opl3->sys_timer_status = 1;

	}

	spin_unlock_irqrestore(&opl3->sys_timer_lock, flags);