mixer: remove alloca() from selem_read()

Both of alloca() and automatic variables keep storages on stack, while
the former generates more instructions than the latter. It's better to use
the latter if the size of storage is computable at pre-compile or compile
time; i.e. just for structures.

This commit obsolete usages of alloca() with automatic variables.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Sakamoto 2016-07-15 09:23:13 +09:00 committed by Takashi Iwai
parent 8d45e412b5
commit 7ada2d6f41

View file

@ -441,17 +441,16 @@ static int selem_read(snd_mixer_elem_t *elem)
return err; return err;
} }
if (s->ctls[CTL_CAPTURE_SOURCE].elem) { if (s->ctls[CTL_CAPTURE_SOURCE].elem) {
snd_ctl_elem_value_t *ctl; snd_ctl_elem_value_t ctl = {0};
selem_ctl_t *c = &s->ctls[CTL_CAPTURE_SOURCE]; selem_ctl_t *c = &s->ctls[CTL_CAPTURE_SOURCE];
snd_ctl_elem_value_alloca(&ctl); err = snd_hctl_elem_read(c->elem, &ctl);
err = snd_hctl_elem_read(c->elem, ctl);
if (err < 0) if (err < 0)
return err; return err;
for (idx = 0; idx < s->str[SM_CAPT].channels; idx++) { for (idx = 0; idx < s->str[SM_CAPT].channels; idx++) {
unsigned int idx1 = idx; unsigned int idx1 = idx;
if (idx >= c->values) if (idx >= c->values)
idx1 = 0; idx1 = 0;
if (snd_ctl_elem_value_get_enumerated(ctl, idx1) != if (snd_ctl_elem_value_get_enumerated(&ctl, idx1) !=
s->capture_item) s->capture_item)
s->str[SM_CAPT].sw &= ~(1 << idx); s->str[SM_CAPT].sw &= ~(1 << idx);
} }