diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2017-03-31 17:21:41 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2017-03-31 17:27:02 +0200 |
| commit | e8ed68205f39a7a934901eab80a5cbf3a062b7b4 (patch) | |
| tree | d1003b050e1f28c77f76e2adac452c15c8dbfa21 /sound/core | |
| parent | ALSA: emux: stop if copy_from_user() fails (diff) | |
| download | linux-e8ed68205f39a7a934901eab80a5cbf3a062b7b4.tar.xz linux-e8ed68205f39a7a934901eab80a5cbf3a062b7b4.zip | |
ALSA: timer: remove some dead code
We just checked "id.card < 0" on the lines before so we know it's not
true here. We can delete that check.
Also checkpatch.pl complains about some extra curly braces so we may as
well fix that while we're at it.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core')
| -rw-r--r-- | sound/core/timer.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/sound/core/timer.c b/sound/core/timer.c index 6d4fbc439246..8b9e7943a83b 100644 --- a/sound/core/timer.c +++ b/sound/core/timer.c @@ -1430,18 +1430,13 @@ static int snd_timer_user_next_device(struct snd_timer_id __user *_tid) if (id.card < 0) { id.card = 0; } else { - if (id.card < 0) { - id.card = 0; + if (id.device < 0) { + id.device = 0; } else { - if (id.device < 0) { - id.device = 0; - } else { - if (id.subdevice < 0) { - id.subdevice = 0; - } else { - id.subdevice++; - } - } + if (id.subdevice < 0) + id.subdevice = 0; + else + id.subdevice++; } } list_for_each(p, &snd_timer_list) { |