diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-01-19 11:43:50 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-01-19 11:43:50 +0100 |
| commit | 28e237a9b7bc45d048ba7cb683ab348701e099fd (patch) | |
| tree | 2252a9da4b0f074f699e1b3fc2f2cd178bcd0fa0 /sound/usb/midi.c | |
| parent | abd083526af3a8a1610e884c8e619925c3d663e6 (diff) | |
| download | op-kernel-dev-28e237a9b7bc45d048ba7cb683ab348701e099fd.zip op-kernel-dev-28e237a9b7bc45d048ba7cb683ab348701e099fd.tar.gz | |
ALSA: usb-audio: Use setup_timer() and mod_timer()
No functional change, refactoring with the standard helpers.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb/midi.c')
| -rw-r--r-- | sound/usb/midi.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/usb/midi.c b/sound/usb/midi.c index 5bfb695..417ebb1 100644 --- a/sound/usb/midi.c +++ b/sound/usb/midi.c @@ -2292,14 +2292,13 @@ int snd_usbmidi_create(struct snd_card *card, umidi->iface = iface; umidi->quirk = quirk; umidi->usb_protocol_ops = &snd_usbmidi_standard_ops; - init_timer(&umidi->error_timer); spin_lock_init(&umidi->disc_lock); init_rwsem(&umidi->disc_rwsem); mutex_init(&umidi->mutex); umidi->usb_id = USB_ID(le16_to_cpu(umidi->dev->descriptor.idVendor), le16_to_cpu(umidi->dev->descriptor.idProduct)); - umidi->error_timer.function = snd_usbmidi_error_timer; - umidi->error_timer.data = (unsigned long)umidi; + setup_timer(&umidi->error_timer, snd_usbmidi_error_timer, + (unsigned long)umidi); /* detect the endpoint(s) to use */ memset(endpoints, 0, sizeof(endpoints)); |
