diff options
| author | Takashi Iwai <[email protected]> | 2019-03-28 16:44:53 +0000 |
|---|---|---|
| committer | Takashi Iwai <[email protected]> | 2019-04-10 06:42:26 +0000 |
| commit | 5d704b0d3b4855734f029337e516b829c473801c (patch) | |
| tree | bbbbb408ba748e1765c4ee77034735232cb64494 /sound/core/timer.c | |
| parent | ALSA: timer: Simplify error path in snd_timer_open() (diff) | |
| download | kernel-5d704b0d3b4855734f029337e516b829c473801c.tar.gz kernel-5d704b0d3b4855734f029337e516b829c473801c.zip | |
ALSA: timer: Coding style fixes
Avoid old school C style but do plain and clear way.
Signed-off-by: Takashi Iwai <[email protected]>
Diffstat (limited to 'sound/core/timer.c')
| -rw-r--r-- | sound/core/timer.c | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/sound/core/timer.c b/sound/core/timer.c index 0eed4fe0da21..d23efec35660 100644 --- a/sound/core/timer.c +++ b/sound/core/timer.c @@ -1909,7 +1909,10 @@ static int snd_timer_user_start(struct file *file) snd_timer_stop(tu->timeri); tu->timeri->lost = 0; tu->last_resolution = 0; - return (err = snd_timer_start(tu->timeri, tu->ticks)) < 0 ? err : 0; + err = snd_timer_start(tu->timeri, tu->ticks); + if (err < 0) + return err; + return 0; } static int snd_timer_user_stop(struct file *file) @@ -1920,7 +1923,10 @@ static int snd_timer_user_stop(struct file *file) tu = file->private_data; if (!tu->timeri) return -EBADFD; - return (err = snd_timer_stop(tu->timeri)) < 0 ? err : 0; + err = snd_timer_stop(tu->timeri); + if (err < 0) + return err; + return 0; } static int snd_timer_user_continue(struct file *file) @@ -1935,7 +1941,10 @@ static int snd_timer_user_continue(struct file *file) if (!(tu->timeri->flags & SNDRV_TIMER_IFLG_PAUSED)) return snd_timer_user_start(file); tu->timeri->lost = 0; - return (err = snd_timer_continue(tu->timeri)) < 0 ? err : 0; + err = snd_timer_continue(tu->timeri); + if (err < 0) + return err; + return 0; } static int snd_timer_user_pause(struct file *file) @@ -1946,7 +1955,10 @@ static int snd_timer_user_pause(struct file *file) tu = file->private_data; if (!tu->timeri) return -EBADFD; - return (err = snd_timer_pause(tu->timeri)) < 0 ? err : 0; + err = snd_timer_pause(tu->timeri); + if (err < 0) + return err; + return 0; } enum { |