mixer: remove alloca() from selem_write_main()

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:24 +09:00 committed by Takashi Iwai
parent 116dafcadc
commit 60920eb7f3

View file

@ -628,17 +628,16 @@ static int selem_write_main(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); if ((err = snd_hctl_elem_read(c->elem, &ctl)) < 0)
if ((err = snd_hctl_elem_read(c->elem, ctl)) < 0)
return err; return err;
for (idx = 0; idx < c->values; idx++) { for (idx = 0; idx < c->values; idx++) {
if (s->str[SM_CAPT].sw & (1 << idx)) if (s->str[SM_CAPT].sw & (1 << idx))
snd_ctl_elem_value_set_enumerated(ctl, snd_ctl_elem_value_set_enumerated(&ctl,
idx, s->capture_item); idx, s->capture_item);
} }
if ((err = snd_hctl_elem_write(c->elem, ctl)) < 0) if ((err = snd_hctl_elem_write(c->elem, &ctl)) < 0)
return err; return err;
/* update the element, don't remove */ /* update the element, don't remove */
err = selem_read(elem); err = selem_read(elem);