diff options
| author | Kees Cook <keescook@chromium.org> | 2017-10-24 08:34:29 -0700 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2017-10-24 21:01:16 +0200 |
| commit | bc47ba90b01afe468cdd586b0dbe59b64862e2b7 (patch) | |
| tree | 67919e97c5af07a8c1467218ea7640e51dd24ce8 /sound/drivers/mpu401 | |
| parent | 1a0190157521704c11f8650756388b62f3887eb3 (diff) | |
| download | linux-bc47ba90b01afe468cdd586b0dbe59b64862e2b7.tar.gz linux-bc47ba90b01afe468cdd586b0dbe59b64862e2b7.tar.bz2 linux-bc47ba90b01afe468cdd586b0dbe59b64862e2b7.zip | |
ALSA: drivers: Convert timers to use timer_setup()
In preparation for unconditionally passing the struct timer_list pointer to
all timer callbacks, switch to using the new timer_setup() and from_timer()
to pass the timer pointer explicitly.
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/drivers/mpu401')
| -rw-r--r-- | sound/drivers/mpu401/mpu401_uart.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sound/drivers/mpu401/mpu401_uart.c b/sound/drivers/mpu401/mpu401_uart.c index b997222274bd..3e745f47dd2f 100644 --- a/sound/drivers/mpu401/mpu401_uart.c +++ b/sound/drivers/mpu401/mpu401_uart.c @@ -169,9 +169,9 @@ EXPORT_SYMBOL(snd_mpu401_uart_interrupt_tx); * timer callback * reprogram the timer and call the interrupt job */ -static void snd_mpu401_uart_timer(unsigned long data) +static void snd_mpu401_uart_timer(struct timer_list *t) { - struct snd_mpu401 *mpu = (struct snd_mpu401 *)data; + struct snd_mpu401 *mpu = from_timer(mpu, t, timer); unsigned long flags; spin_lock_irqsave(&mpu->timer_lock, flags); @@ -191,8 +191,7 @@ 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) { - setup_timer(&mpu->timer, snd_mpu401_uart_timer, - (unsigned long)mpu); + timer_setup(&mpu->timer, snd_mpu401_uart_timer, 0); mod_timer(&mpu->timer, 1 + jiffies); } mpu->timer_invoked |= input ? MPU401_MODE_INPUT_TIMER : |