diff options
| author | Muhammad Falak R Wani <falakreyaz@gmail.com> | 2016-05-15 13:56:51 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-05-17 19:02:20 +0300 |
| commit | c7c5856b6f6f30de622bf87947363890b286553f (patch) | |
| tree | 8d1ff133995794b57db804515dfbc251679a8080 /sound/oss | |
| parent | 6971ce4134174b9772ed79ff7747696eab087d30 (diff) | |
| download | linux-c7c5856b6f6f30de622bf87947363890b286553f.tar.xz | |
sound: oss: Use setup_timer and mod_timer.
The function setup_timer combines the initialization of a timer with the
initialization of the timer's function and data fields. The mulitiline
code for timer initialization is now replaced with function setup_timer.
Also, quoting the mod_timer() function comment:
-> mod_timer() is a more efficient way to update the expire field of an
active timer (if the timer is inactive it will be activated).
Use setup_timer() and mod_timer() to setup and arm a timer, making the
code compact and aid readablity.
Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/oss')
| -rw-r--r-- | sound/oss/waveartist.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sound/oss/waveartist.c b/sound/oss/waveartist.c index b36ea47527e8..0b8d0de87273 100644 --- a/sound/oss/waveartist.c +++ b/sound/oss/waveartist.c @@ -1414,11 +1414,9 @@ attach_waveartist(struct address_info *hw, const struct waveartist_mixer_info *m else { #ifdef CONFIG_ARCH_NETWINDER if (machine_is_netwinder()) { - init_timer(&vnc_timer); - vnc_timer.function = vnc_slider_tick; - vnc_timer.expires = jiffies; - vnc_timer.data = nr_waveartist_devs; - add_timer(&vnc_timer); + setup_timer(&vnc_timer, vnc_slider_tick, + nr_waveartist_devs); + mod_timer(&vnc_timer, jiffies); vnc_configure_mixer(devc, 0); |